From 1d81f2d8f9a1f89c45b95615a1122ce59873c69c Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Sun, 14 Feb 2021 09:59:13 +0100 Subject: Mapped ThinkVantage to the refresh function. Added new section on usage --- README.md | 24 ++++++++++++++++++++---- about.html | 12 +++++++++--- debian/changelog | 5 +++-- makefile | 2 ++ my-x200-thinkvantage.sh | 2 ++ my-x200.sh | 11 +++++++++++ my-x200_0.7-2.debian.tar.xz | Bin 1508 -> 0 bytes my-x200_0.7-2.dsc | 41 ----------------------------------------- my-x200_0.7-2_amd64.deb | Bin 5056 -> 0 bytes my-x200_0.7-3.debian.tar.xz | Bin 0 -> 1540 bytes my-x200_0.7-3.dsc | 41 +++++++++++++++++++++++++++++++++++++++++ my-x200_0.7-3_amd64.deb | Bin 0 -> 5152 bytes my-x200_0.7.orig.tar.gz | Bin 7992 -> 10459 bytes 13 files changed, 88 insertions(+), 50 deletions(-) create mode 100644 my-x200-thinkvantage.sh delete mode 100644 my-x200_0.7-2.debian.tar.xz delete mode 100644 my-x200_0.7-2.dsc delete mode 100644 my-x200_0.7-2_amd64.deb create mode 100644 my-x200_0.7-3.debian.tar.xz create mode 100644 my-x200_0.7-3.dsc create mode 100644 my-x200_0.7-3_amd64.deb diff --git a/README.md b/README.md index f316497..cdc5be0 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ advisable to verify the signature like so:— For a good GPG cheat sheet, see [here](https://guides.library.illinois.edu/data_encryption/gpgcheatsheet). Configuration -------------- +============= Once installed, `my-x200` is configured by editing [`/etc/default/my-x200`](http://git.robertalessi.net/my-x200/tree/my-x200.confd). @@ -102,8 +102,8 @@ course, the backup process is triggered on certain conditions only: Then, once these conditions are met, the backup process is triggered whenever the service is stopped. -Use and recommended configuration ---------------------------------- +Recommended Settings +-------------------- > The command `rc-update` that is used below refers to `openrc`. Other > init systems use other commands. Please adapt. @@ -171,7 +171,23 @@ rc-update del avahi-daemon chmod -x /etc/network/if-up.d/avahi-daemon ```` +Usage +===== +In addition to the usual arguments, namely `start`, `stop`, `restart` +and `force-reload`, `/etc/init.d/my-x200` accepts two further +arguments, like so:— + +1. `/etc/init.d/my-x200 refresh` to reset the frequency rate of the + screen to the default value. This is to be used in the hopefully + rare cases when the noise becomes perceptible again. Unprivileged + users may perform this action by pressing the `ThinkVantage` + button. +2. `/etc/init.d/my-x200 initbackup`. If backuping be set as described + above, `/etc/init.d/my-x200 initbackup` can be used to trigger a + backup round immediately, that is without having to shut down the + system for the first backup round to happen. + Further Information -------------------- +=================== More information in `my-x200` initd file: diff --git a/about.html b/about.html index fc09fec..d181a0b 100644 --- a/about.html +++ b/about.html @@ -41,7 +41,7 @@
  • Verify the signature: dscverify --keyring ~/.gnupg/pubring.gpg my-x200_<ver>.dsc (Replace <ver> with the actual release number.)

    • For a good GPG cheat sheet, see here.

    -

    Configuration

    +

    Configuration

    Once installed, my-x200 is configured by editing /etc/default/my-x200.

    It is also possible to leave /etc/default/my-200 untouched. In this case, my-x200 can source its configuration from one or more *.conf files written in a specific directory /etc/default/my-x200.d/ which is to be created. This is the recommended method for these files cannot be affected by subsequent updates.

    Noise Removal

    @@ -56,7 +56,7 @@
  • An (empty) dobackup file must be present in the backup directory.

    • Then, once these conditions are met, the backup process is triggered whenever the service is stopped.

    - +

    The command rc-update that is used below refers to openrc. Other init systems use other commands. Please adapt.

    @@ -100,7 +100,13 @@ wpa-roam /etc/wpa_supplicant/wpa_supplicant.conf

    To disable avahi, do (as root):

    rc-update del avahi-daemon
 chmod -x /etc/network/if-up.d/avahi-daemon
    -

    Further Information

    +

    Usage

    +

    In addition to the usual arguments, namely start, stop, restart and force-reload, /etc/init.d/my-x200 accepts two further arguments, like so:—

    +
      +
    1. /etc/init.d/my-x200 refresh to reset the frequency rate of the screen to the default value. This is to be used in the hopefully rare cases when the noise becomes perceptible again. Unprivileged users may perform this action by pressing the ThinkVantage button.
      2. +
    2. /etc/init.d/my-x200 initbackup. If backuping be set as described above, /etc/init.d/my-x200 initbackup can be used to trigger a backup round immediately, that is without having to shut down the system for the first backup round to happen.
      3. +
    +

    Further Information

    More information in my-x200 initd file: http://git.robertalessi.net/my-x200/tree/my-x200.confd

    diff --git a/debian/changelog b/debian/changelog index 3873d92..9355a6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -my-x200 (0.7-2) UNRELEASED; urgency=medium +my-x200 (0.7-3) UNRELEASED; urgency=medium * Initial release. * Removed remnant lines left of openrc-run in initd file * Added elogind as dependency * New acpi event: button/suspend * Added conflict with acpi-support + * Map ThinkVantage to /etc/init.d/my-x200 refresh - -- Robert Alessi Sat, 13 Feb 2021 17:01:19 +0100 + -- Robert Alessi Sun, 14 Feb 2021 09:17:40 +0100 diff --git a/makefile b/makefile index e46d700..2157cfb 100644 --- a/makefile +++ b/makefile @@ -37,6 +37,7 @@ install: 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 -Dm644 my-x200-thinkvantage.sh $(DESTDIR)etc/acpi/events/my-x200-thinkvantage install -Dm755 my-x200.sh $(DESTDIR)etc/acpi/my-x200.sh uninstall: @@ -45,6 +46,7 @@ uninstall: rm -rf $(DESTDIR)etc/acpi/events/my-x200-lid rm -rf $(DESTDIR)etc/acpi/events/my-x200-sleep rm -rf $(DESTDIR)etc/acpi/events/my-x200-suspend + rm -rf $(DESTDIR)etc/acpi/events/my-x200-thinkvantage rm -rf $(DESTDIR)etc/acpi/my-x200.sh .PHONY: all clean install uninstall prepare debian debian_package diff --git a/my-x200-thinkvantage.sh b/my-x200-thinkvantage.sh new file mode 100644 index 0000000..90b3cca --- /dev/null +++ b/my-x200-thinkvantage.sh @@ -0,0 +1,2 @@ +event=button/vendor.* +action=/etc/acpi/my-x200.sh %e diff --git a/my-x200.sh b/my-x200.sh index 1cd3b06..42dec59 100644 --- a/my-x200.sh +++ b/my-x200.sh @@ -41,4 +41,15 @@ case "$1" in ;; esac ;; + button/vendor) + case "$2" in + VNDR) + logger 'ThinkVantage pressed' + /etc/init.d/my-x200 refresh + ;; + *) + logger "ACPI action undefined: $2" + ;; + esac + ;; esac diff --git a/my-x200_0.7-2.debian.tar.xz b/my-x200_0.7-2.debian.tar.xz deleted file mode 100644 index 1aed498..0000000 Binary files a/my-x200_0.7-2.debian.tar.xz and /dev/null differ diff --git a/my-x200_0.7-2.dsc b/my-x200_0.7-2.dsc deleted file mode 100644 index 90dc184..0000000 --- a/my-x200_0.7-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.7-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: - 82dc31efabd4a7493c9d4737cae2dc942ff5f31b 7992 my-x200_0.7.orig.tar.gz - 90fa97683d4a58cbf85e92753addd90f7958de2a 1508 my-x200_0.7-2.debian.tar.xz -Checksums-Sha256: - 172e2379d070f2bd49609fb892e4ff0de5975efb654d97f68671fba51d3d2255 7992 my-x200_0.7.orig.tar.gz - f133ac6eb5511575ada8d3f72cec61360440f9ac6c3f9b6d4e346f977403a007 1508 my-x200_0.7-2.debian.tar.xz -Files: - c23018e118c3b1f7bd1831b222603401 7992 my-x200_0.7.orig.tar.gz - f4d691f876cebc5edd571100045a4ef2 1508 my-x200_0.7-2.debian.tar.xz - ------BEGIN PGP SIGNATURE----- - -iQJMBAEBCAA2FiEERaXhpjEUeDwRCTLxF3PpJICFyMcFAmAn+NgYHGFsZXNzaUBy -b2JlcnRhbGVzc2kubmV0AAoJEBdz6SSAhcjHEygP/jTMM/0+NjhZ+eKDTiAvJMMI -MfiWDjk7pyc0yP6Xs5kH7Dx05WpgQUQVntMGu+/6i6d5nbPfRmtNeAG3QpiN+isZ -ivF2Z+yCj0qEKqaK41DSvh2E3PnWZv7/mOfvKsg6B3Qa3Z8BPe9j/f+7bLqrPGn1 -4DrJBNg5AzDSzvJ7LMfT4zpL2NfBoYn4PfCFraUgCrNC99vRTI27VfcIOCtV6QaE -xEG2BOISmh6e5lk2d8nq2UzzsSsKCuQZ4iHQGdWiCUM0VWfPehGoZB8AhxlXeLkb -VMtgLqAYAGXI9xDP2dR62rDWHBxCbTUaWhfwNZOvlZ+F03pxRp+2J2LO3OdfHJpQ -sxXTw5OHqTcMuTCCsEvmfs3Db+UfTFCIRn26eb9lzcfnUfE0gPOp6USScttd1+cx -S3CP1jsVdcjn6GbJWnSZ3PNNu19Nz5kukd+rdu3IDkOoCMbVYA+OBzzCL8l3gQPG -/+wzGgagyvpJV5FRSW32l4OwZ5L37LRk6Ke0CLS9tvahsMRHo4CJhGVkU1LPUXop -zVwctkfVAtBmMYlFNmu27clVoStsHIxmK/ESHecW3q4PIWoaByj2LlPBg8wYyue8 -FLA/DbGUP64kV5T3wu36wbT9PpY9iWcPnFu8nmnI6M8MTu6TId7J2/AEsqOMviie -bn4QfYBj4IYNNkLbKDe/ -=XpnR ------END PGP SIGNATURE----- diff --git a/my-x200_0.7-2_amd64.deb b/my-x200_0.7-2_amd64.deb deleted file mode 100644 index 579b65d..0000000 Binary files a/my-x200_0.7-2_amd64.deb and /dev/null differ diff --git a/my-x200_0.7-3.debian.tar.xz b/my-x200_0.7-3.debian.tar.xz new file mode 100644 index 0000000..c08b210 Binary files /dev/null and b/my-x200_0.7-3.debian.tar.xz differ diff --git a/my-x200_0.7-3.dsc b/my-x200_0.7-3.dsc new file mode 100644 index 0000000..583fc9c --- /dev/null +++ b/my-x200_0.7-3.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-3 +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: + 77bcdc4b96b3c5a7c4881287e441d4f6d7d97502 10459 my-x200_0.7.orig.tar.gz + c477b3bf8ba5461d564a0e508034d73b27705475 1540 my-x200_0.7-3.debian.tar.xz +Checksums-Sha256: + 6f16d3a407664c4c52a3c84bf5a9c1730b9f78962153a2e5502b3fc5aa79eb52 10459 my-x200_0.7.orig.tar.gz + dab40535f216ccbda4c6ec68d7fd60abd9abda2f334eb5d34e88a154260cfe42 1540 my-x200_0.7-3.debian.tar.xz +Files: + 4b35e9a14c07861ec37c0e6fc9054fb2 10459 my-x200_0.7.orig.tar.gz + a368e67ebbb7b1787cefe0ca29cf80c5 1540 my-x200_0.7-3.debian.tar.xz + +-----BEGIN PGP SIGNATURE----- + +iQJMBAEBCAA2FiEERaXhpjEUeDwRCTLxF3PpJICFyMcFAmAo5SoYHGFsZXNzaUBy +b2JlcnRhbGVzc2kubmV0AAoJEBdz6SSAhcjHSxgQAJiAf4dFa5PAWwGyVWiaseRY +djUxI7wT1ybazwyTbD9RWC8qv9jYCBVBxIN5PAdxo5fE5enzsEKC5CR02kDz0p+j +KaGV5VwnKorfFcQ8Ijyk9VhFmAlG9I4qV3E95UE3oAY6RDqvywhxESuAeRpy2Ycj +Lm+D9juyb2w/0L2C+EcqRSxc+4Qs+TGX9zWaKDrPR1YWjnprqFR1HJVWOKj7Ln47 +Q8NRSo6PODlODy/j4Ax4SIhc13QpwiJ/ZTrwUqSzncpfSbIF1TCH9dgXAymGmpcK +GJ12l2fybFBO3OyFAS9/jqzWk8yx3seue9dUWA84lfhjrPfClf3/LA6fCf0UhbbC +QWfKg7CUzuxVfLrQtoAkorjAhzTn2Ir0ey5qUbPqY8zZ2vRe4W8ngRQR86VR9v8V +SfOb0Mo6w8ys5ju7yem9RBoiN4LTi4BumhXi4eYIDh9bLDIpaLb4VPLTxh8NTOsz +jXQT6Q84T8nbT+BT/6Upa6VEzYLBmBLYXI5AXy0FAO2C2SlRWwngP3A0kFoi4dYR +aeAsqe+fu8GXCc/mdoj5cl+aipw6rYw3wgpNDulAJqyCCZIgzWYMnGGb68II1Hw2 +38T1yEgMLTUu/Nrk8bqZw5e8+rpqxy5smshyhtI3AjcUJTPKlN2FyVUxVxECWULt +aKaXZD33OaFye3/4kUX3 +=8CcE +-----END PGP SIGNATURE----- diff --git a/my-x200_0.7-3_amd64.deb b/my-x200_0.7-3_amd64.deb new file mode 100644 index 0000000..bb8b9a1 Binary files /dev/null and b/my-x200_0.7-3_amd64.deb differ diff --git a/my-x200_0.7.orig.tar.gz b/my-x200_0.7.orig.tar.gz index 085eacd..d0f9566 100644 Binary files a/my-x200_0.7.orig.tar.gz and b/my-x200_0.7.orig.tar.gz differ -- cgit v1.2.3