diff options
| author |   Paul Healy <lmiphay@gmail.com> | 2015-11-10 21:35:08 +0000 |
|---|---|---|
| committer | Paul Healy <lmiphay@gmail.com> | 2015-11-10 21:35:08 +0000 |
| commit | 823b3200040941e1571a51b854731caa461e9c86 (patch) | |
| tree | 68860dea9ea81cd1747bc2ab557c6b6d95bbcbea /app-misc | |
| parent | update manifest (diff) | |
| download | lmiphay-823b3200040941e1571a51b854731caa461e9c86.tar.gz lmiphay-823b3200040941e1571a51b854731caa461e9c86.tar.bz2 lmiphay-823b3200040941e1571a51b854731caa461e9c86.zip | |
dont race bind loads and LCD writes
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/g13/Manifest | 4 | ||||
| -rw-r--r-- | app-misc/g13/files/g13.conf.d | 6 | ||||
| -rwxr-xr-x | app-misc/g13/files/g13.init.d | 9 |
3 files changed, 15 insertions, 4 deletions
diff --git a/app-misc/g13/Manifest b/app-misc/g13/Manifest index 7faca07..8b31d5d 100644 --- a/app-misc/g13/Manifest +++ b/app-misc/g13/Manifest @@ -1,7 +1,7 @@ AUX 99-uinput-g13.rules 48 SHA256 499589608961e50edc99a9d4652a5153091436b487cd4e365fe1e4cc9b25b2e3 SHA512 880c08499031a0ee3ce0868112c689358a800a09489a33eea7c34d433221cc483ac1e6ca7fbbc95531b9f93259da84d6404070f59c9a3752d60971b3cd9e4c16 WHIRLPOOL 0319b513c89b4ddd09a855ebd6e3c0171275c2c66ba19ba56c31f5919628e1949b03132ffd62827e9a8077c0d66aa4d58d5a69bad250b633d068a2d22862c447 AUX add-modifiers.patch 10316 SHA256 e2c4e6e556f1fcc908ef28d57ee3d9f1c4dc2a035b16c6621039fc9a2b664e16 SHA512 12d932bb53c10a2df93a943517ba07cfae98bbf0aeb1a4959d9e08e178894ebeb4a7fb4508a6ed76c5779a07aeda8a1ee6fcbb881f3d72b2a8cfa746b23d435e WHIRLPOOL 2072730fe365b67c68a7d76be982b41d49d92bc71805cab0b03a2b02f4dbb2c5a227c02ca9663e527e91a4b7d08cb6bd4422424c1a00bdbd579e101281a27510 -AUX g13.conf.d 303 SHA256 b99939ad106153239c8bc2c81c31c3061c52fc3a88ee52fbd78b7190cb0eb3a9 SHA512 ed4144b0e783d65fe422bb96e05b083d1150c0e87d6e53ac718deea668a1bc8cbcf3522098cb40030eb7d8cff56f97bf35a9d67b5622d03eaaec237d25214650 WHIRLPOOL 44d1ca789fc36d18fc7afb6c28143c17dd3b0c6549d9ee459b69a87e758ae62322ff16d78a8ee694212ead275e9a7200432bd060fd6807a802e8e1914235b74e -AUX g13.init.d 929 SHA256 20b9d268ea7f51b05226a04e3497e6de07ac446c53039a7aa2040776712bc48f SHA512 a53f44ff60f665c4668a5896e5966dc5d55d6608f2ab484f9adbf5aa1545185be39afdcf04a8848a3c3a811fd5d10d41c0291204c063374f45c9b2e0e0e85387 WHIRLPOOL 0eb7a2a1658d5f554db7243ea61da0b94310c0c7611ff5dd305e7c887961e4765ee172bce95ec32938d86983fd134cfe0d0f29819d0aa0f5699ff4d843aedb6b +AUX g13.conf.d 462 SHA256 089c36aa414ef9d5eacee759238a1775af0e54f12e8c2c2a8d2e4836f0e276b2 SHA512 801e2ed37243453fecc615099bedd60045dd04f31deaa79fd6ba72bec849e616d0621e52e1db37ce2af429600ca5493e75d7e54366deede9447b1e0ed1924dae WHIRLPOOL 3e227052b2bb3d922f814d6f6440db406b4e859140c7eb38546ef93abeeeceeb7e0917ea2aaba6392e8a83f2ae4b6430781e2c3fd1f057b9a7c9f2f162b5b556 +AUX g13.init.d 1090 SHA256 7ed82d277e200317b8a5b9c2802513aca18a94a1f341d77582b6bfdb8a2aa688 SHA512 a6f000359028d05c2e5c69fead6e3f0ec599fd26843b44602485697caa3f5ea4e7af1b1b5108d7f66ef11b06ebc97d26ad1949449906eab611e88b37091cef23 WHIRLPOOL 3dca58ca53798c9cc0ff56b94f6e602093c136ac3d5b7881b7810c85a2e486e7069e45d56cadd837eb18717449bb377198bab78136d50a7c95168ce06b3382db AUX g13loadbind 190 SHA256 b0b83cb74ebd463248593e66e2d64673067df2c4cc58f8d48c189b88e2aaa6dd SHA512 d4abd4361a8f8a34696408382d92c335d2cef9adb496c6500b1cb72a1c4a220eb8ceb93a3fe8347982091042571f3f0b778e550f6a5c5fd6e3b407d2814bc84a WHIRLPOOL ca0a06ae601bf073f399c38d6404ddd7acbf092846fa62bfead3f157dc62c2a0924790a63d21cc774c89698107e06a565d8b11e43ebb324b758a6e060f4a699a AUX g13mod 319 SHA256 2507f11307858fdec95370c635096b3f4b71bb84b137ec0a51c34b97cbeac0be SHA512 ff51531522fe35f0c71c5b2c4692062355e86841bdf48e4f7fc9b19df2440b738f274ddcc4d8b5acb3ca5df84a694d251a2fa504a8ff6230fa7e846dcdd510fd WHIRLPOOL e35a438159a55a00905fa7de69065d38e63561afdf45c531992d310b4d071bfd2ea150d24b92a15fd95f67a627f033879758afd4045a94e0efa3c04989ca0ee8 AUX g13writelcd 270 SHA256 2c379e59ed7030a54a16f29a9fc939c175ce3705f501cdd086061839a584e406 SHA512 330b968d676e5fab9034004d1c659f61f312194267021e0b07b4ed0f5660671a4bec59b21493bcb66c2eb711da188be6609c8fa7c0ff787ccfed8bf3a2b4ae71 WHIRLPOOL 33cbdcf2eb4b5069f953b8c17658d231a41006ea616e1d94b0af8d5c71ae94fd18b28ebc6431afe6e4ab90f0ca86ca8d91cbe96ceb2be1aec2fdf6766fb2e056 diff --git a/app-misc/g13/files/g13.conf.d b/app-misc/g13/files/g13.conf.d index 692d62c..d0e6359 100644 --- a/app-misc/g13/files/g13.conf.d +++ b/app-misc/g13/files/g13.conf.d @@ -4,6 +4,12 @@ # G13_ARGS="/usr/share/g13/logo.lpbm" +### +# Note that only one of either writing a message to the LCD or +# loading default bindings can be done at startup due to a race +# in the parser. +### + # Message to be written to the G13 LCD on startup G13_LCDMSG="Welcome to\n Gentoo" diff --git a/app-misc/g13/files/g13.init.d b/app-misc/g13/files/g13.init.d index ee20687..0de5b51 100755 --- a/app-misc/g13/files/g13.init.d +++ b/app-misc/g13/files/g13.init.d @@ -21,7 +21,7 @@ command_background=yes pidfile=/run/g13.pid stopsig="SIGINT" - + depend() { need localmount @@ -43,8 +43,13 @@ start_pre() start_post() { - g13writelcd "$G13_LCDMSG" + # the parse is racey - only do either: + # 1. the load bind or + # 2. the lcd msg write + # for the moment. if [ -f "$G13_BINDFILE" ] ; then g13loadbind "$G13_BINDFILE" + elif [ -n "$G13_LCDMSG" ] ; then + g13writelcd "$G13_LCDMSG" fi } |