From 15f1fdc7b5153070ac67a4f6c46b91e451b2ded4 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Sat, 13 Feb 2021 10:02:53 +0100 Subject: new event: button/suspend. added elogind as dependency --- README.md | 3 ++- about.html | 1 + debian/changelog | 6 ++++-- debian/control | 2 +- makefile | 3 ++- my-x200-suspend.sh | 2 ++ my-x200.sh | 12 ++++++++++++ my-x200_0.6-2.debian.tar.xz | Bin 1436 -> 0 bytes my-x200_0.6-2.dsc | 41 ----------------------------------------- my-x200_0.6-2_amd64.deb | Bin 4880 -> 0 bytes my-x200_0.6.orig.tar.gz | Bin 3359469 -> 0 bytes my-x200_0.7-1.debian.tar.xz | Bin 0 -> 1492 bytes my-x200_0.7-1.dsc | 41 +++++++++++++++++++++++++++++++++++++++++ my-x200_0.7-1_amd64.deb | Bin 0 -> 5020 bytes 14 files changed, 65 insertions(+), 46 deletions(-) create mode 100644 my-x200-suspend.sh delete mode 100644 my-x200_0.6-2.debian.tar.xz delete mode 100644 my-x200_0.6-2.dsc delete mode 100644 my-x200_0.6-2_amd64.deb delete mode 100644 my-x200_0.6.orig.tar.gz create mode 100644 my-x200_0.7-1.debian.tar.xz create mode 100644 my-x200_0.7-1.dsc create mode 100644 my-x200_0.7-1_amd64.deb diff --git a/README.md b/README.md index 9920587..c64048a 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,8 @@ wpa-roam /etc/wpa_supplicant/wpa_supplicant.conf Do Not Use ---------- 1. NetworkManager -2. Avahi +2. acpi-support (but acpi-support-base is fine and needed) +3. Avahi To disable `avahi`, do (as root): diff --git a/about.html b/about.html index 074f5da..e7244d5 100644 --- a/about.html +++ b/about.html @@ -94,6 +94,7 @@ wpa-roam /etc/wpa_supplicant/wpa_supplicant.conf

Do Not Use

  1. NetworkManager
    2. +
  2. acpi-support (but acpi-support-base is fine and needed)
  3. Avahi

To disable avahi, do (as root):

diff --git a/debian/changelog b/debian/changelog index fe9e689..bcd2ac1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -my-x200 (0.6-2) UNRELEASED; urgency=medium +my-x200 (0.7-1) UNRELEASED; urgency=medium * Initial release. * Removed remnant lines left of openrc-run in initd file + * Added elogind as dependency + * New acpi event: button/suspend - -- Robert Alessi Sun, 07 Feb 2021 15:47:20 +0100 + -- Robert Alessi Sat, 13 Feb 2021 09:47:12 +0100 diff --git a/debian/control b/debian/control index b3cc4bd..0868d57 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Homepage: http://git.robertalessi.net/my-x200 Package: my-x200 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, intel-gpu-tools, rsync, - macchanger, rfkill, acpi-support-base + elogind, macchanger, rfkill, acpi-support-base Recommends: rsnapshot Description: Service dedicated to Thinkpads X200 my-x200 is a simple service primarily designed to make the diff --git a/makefile b/makefile index 68dd4a8..c61238d 100644 --- a/makefile +++ b/makefile @@ -1,7 +1,7 @@ pkgname = my-x200 exts := md html confd initd sh deb dsc orig.tar.gz debian.tar.xz findopts := $(foreach ext,$(exts),-or -iname "*.$(ext)") -pkgver := 0.6 +pkgver := 0.7 all: install @@ -35,6 +35,7 @@ install: install -Dm644 my-x200.confd $(DESTDIR)etc/default/my-x200 install -Dm644 my-x200-lid.sh $(DESTDIR)etc/acpi/events/my-x200-lid install -Dm644 my-x200-sleep.sh $(DESTDIR)etc/acpi/events/my-x200-sleep + install -Dm644 my-x200-suspend.sh $(DESTDIR)etc/acpi/events/my-x200-suspend install -Dm755 my-x200.sh $(DESTDIR)etc/acpi/my-x200.sh uninstall: diff --git a/my-x200-suspend.sh b/my-x200-suspend.sh new file mode 100644 index 0000000..c46d33c --- /dev/null +++ b/my-x200-suspend.sh @@ -0,0 +1,2 @@ +event=button/suspend.* +action=/etc/acpi/my-x200.sh %e diff --git a/my-x200.sh b/my-x200.sh index a34d9b0..1cd3b06 100644 --- a/my-x200.sh +++ b/my-x200.sh @@ -14,6 +14,18 @@ case "$1" in ;; esac ;; + button/suspend) + case "$2" in + SUSP) + logger 'SuspendButton pressed' + /bin/loginctl sleep + rc-service my-x200 restart + ;; + *) + logger "ACPI action undefined: $2" + ;; + esac + ;; button/lid) case "$3" in close) diff --git a/my-x200_0.6-2.debian.tar.xz b/my-x200_0.6-2.debian.tar.xz deleted file mode 100644 index 9a666d5..0000000 Binary files a/my-x200_0.6-2.debian.tar.xz and /dev/null differ diff --git a/my-x200_0.6-2.dsc b/my-x200_0.6-2.dsc deleted file mode 100644 index 2921f39..0000000 --- a/my-x200_0.6-2.dsc +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -Format: 3.0 (quilt) -Source: my-x200 -Binary: my-x200 -Architecture: any -Version: 0.6-2 -Maintainer: Robert Alessi -Homepage: http://git.robertalessi.net/my-x200 -Standards-Version: 4.3.0 -Build-Depends: debhelper (>= 10) -Package-List: - my-x200 deb misc optional arch=any -Checksums-Sha1: - 46dd490aa2c55c30780c8ff941ddc293c2ab5962 3359469 my-x200_0.6.orig.tar.gz - fc77b94ca453b12a16eb2e8e5dd80387fc5f3dfe 1436 my-x200_0.6-2.debian.tar.xz -Checksums-Sha256: - 31ea7ae4ec7df28ce5a5ce498be6a721590b0b26f315ab6261dba7145fa8ce77 3359469 my-x200_0.6.orig.tar.gz - 38371a1002c278d147ec5a3383c201ab15178cd749f5c7ab49df889d6c63a78a 1436 my-x200_0.6-2.debian.tar.xz -Files: - 2757c40eefe786cc922d0f82a25dca32 3359469 my-x200_0.6.orig.tar.gz - 08e2552fbd769e9d9aec4bafd5a3ba2a 1436 my-x200_0.6-2.debian.tar.xz - ------BEGIN PGP SIGNATURE----- - -iQJMBAEBCAA2FiEERaXhpjEUeDwRCTLxF3PpJICFyMcFAmAmqdkYHGFsZXNzaUBy -b2JlcnRhbGVzc2kubmV0AAoJEBdz6SSAhcjHIZoP/iAXvThBK2MBWqbLh0jevaFw -f87Q9v9Pj/N7gnv3JSkKkQRyCtIBfMI9LmtaUgZ/Fk4YG9Rp70nwKHx9g+shiP1h -MIpFaryHK3qBGwkX8AmIYmyIJrwqNAa819SXce6C0oe0y4Y2sU2rcB1XZwVU12z1 -3pSFXsbGm/ycYZozRV2HeIDVvJ0287jqjg1T8NSgFzrqICzgI8srh4MSeT43Ia70 -jyAYMLTSV6JsFBUknmBsriKMwzHbmjElUJd1l1NdJgYD4U0qAzv8qnQn9rLCrB65 -JtYTvnWRY9CWg3KmJrhA4hdueJsaj/zA5TF3QUU7VEHkkBHlOwFtvx3hHoW60Dy/ -Rk6p6915NgfOei85JvsdV9m2QAInpDx+8nf7s5eMf4xAvk+7qu6a04/oU65ShTDS -IVKbXWyydS30wEc2C2u49a8VBJday0yx88H0Lc4EocAnD4Ehrr2oUJ56FaPZYPCg -pi6F9iM7JxjjrKwRLBSG/PFofX01sibtfK5Fg3bWVerNr3uvEgK5D7C6qKaAUTcx -ILvl0iHBAJN7o/BjyySbfGJ5VcGgwx2SqetVsdPdEchCjs6N0l9eCW8CNJkPkoJY -t2be3NirpAZzuMLA2l6cGOTsgQBg1Ym1JKQpxszmWHC/axonVddf14QQcLKxXdRE -Yq616UM8aTNyFqa1MEjV -=Iegc ------END PGP SIGNATURE----- diff --git a/my-x200_0.6-2_amd64.deb b/my-x200_0.6-2_amd64.deb deleted file mode 100644 index 1c70d70..0000000 Binary files a/my-x200_0.6-2_amd64.deb and /dev/null differ diff --git a/my-x200_0.6.orig.tar.gz b/my-x200_0.6.orig.tar.gz deleted file mode 100644 index 4bb3791..0000000 Binary files a/my-x200_0.6.orig.tar.gz and /dev/null differ diff --git a/my-x200_0.7-1.debian.tar.xz b/my-x200_0.7-1.debian.tar.xz new file mode 100644 index 0000000..cd8f230 Binary files /dev/null and b/my-x200_0.7-1.debian.tar.xz differ diff --git a/my-x200_0.7-1.dsc b/my-x200_0.7-1.dsc new file mode 100644 index 0000000..244e517 --- /dev/null +++ b/my-x200_0.7-1.dsc @@ -0,0 +1,41 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +Format: 3.0 (quilt) +Source: my-x200 +Binary: my-x200 +Architecture: any +Version: 0.7-1 +Maintainer: Robert Alessi +Homepage: http://git.robertalessi.net/my-x200 +Standards-Version: 4.3.0 +Build-Depends: debhelper (>= 10) +Package-List: + my-x200 deb misc optional arch=any +Checksums-Sha1: + c981758aeff114e1cf48140e4674ea9fe4e55438 28751153 my-x200_0.7.orig.tar.gz + 9fd716305efccafdd42b335eb606b38e5f323297 1492 my-x200_0.7-1.debian.tar.xz +Checksums-Sha256: + 6bbfd19d54af401baa8094625de41c29341b352776b6b0647126af3f70ead86c 28751153 my-x200_0.7.orig.tar.gz + f587e5a8cfffa24e1845bc5a0ed5d0eadc4e498d08fe91fb740805bd03fb0644 1492 my-x200_0.7-1.debian.tar.xz +Files: + 94e1a305a7b1c08eac2b222d5a10a9ba 28751153 my-x200_0.7.orig.tar.gz + d7b0af5966e6f42e0162288e8804c169 1492 my-x200_0.7-1.debian.tar.xz + +-----BEGIN PGP SIGNATURE----- + +iQJMBAEBCAA2FiEERaXhpjEUeDwRCTLxF3PpJICFyMcFAmAnlTcYHGFsZXNzaUBy +b2JlcnRhbGVzc2kubmV0AAoJEBdz6SSAhcjHiKEQAIjRIQTDTZe06kwQVcA1OZtp +xWLE2vfEOXBaov2G/EMTuqnSfyYeBNE0cPnP57R6TwkuTtgAurMqf60WFyyaMhUs +OmLS85eb4XrZyhG48+9rI3Fcw/951Pwncpa93EDNJVqGeLIM+2MTmY6xwrHlHy0A +OknvKc2IQXNRDF2uuhHVSlKxTIsUXonJ429ssIgcGQUtuNlnVWvaMQT5SuHgvs15 +EHcI6UHrbrkLesHa7tgk/oG33sLzW6oSYasuoNoL37nRfTCDaDHtUpwvzpVAK6Ub +ZoYXed2BvH3WXsb0NMSwOxHdNu2/N6AQofBA9zep/LjVhVUXAlC6DK473KHbzt41 +uuyJ2vceK9zoDBneKYY4xZHYXTIdvFrdk1JAcvvXGiaAfTrEsfWnm+hy9u228P8/ +/TJvHLCWBcrGmQ1DynYEDA7Xd7FbS6aj/ey5m++WnVCKC2xXWxI3nVefX4op/S5C +qIqx80E3VKpIM4KVE3E81Nc/5thCgmc85jnawzhY15jXpjj3BvNQnHvwjH9WqtB8 +HZAmgnMFJv0y8NrI2oz8tfMup7Fped06V0Tzrjn7wer1NVgr9gyqjrFM31qV2rBk +HkJiwSI00Qbmj8dMPk+lOC9P6VcOXCwwoyByPVkZjaCBuvRMxp65anVkqKdANM4D +md9wiZBL+LYqapqnJvx1 +=7rEE +-----END PGP SIGNATURE----- diff --git a/my-x200_0.7-1_amd64.deb b/my-x200_0.7-1_amd64.deb new file mode 100644 index 0000000..ff8186f Binary files /dev/null and b/my-x200_0.7-1_amd64.deb differ -- cgit v1.2.3