added x200-my in conf.d0.2

3 files changed, 26 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d411376..18df504 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Robert Alessi <alessi@robertalessi.net>
 
 pkgname=x200-my
-pkgver=0.1
-pkgrel=2
+pkgver=0.2
+pkgrel=1
 pkgdesc="Service which removes whining noise from Thinkpads X200. Also powers off the wifi on shutdown."
 arch=(any)
 license=(GPL2)
@@ -10,10 +10,12 @@ url="http://git.robertalessi.net/x200-my"
 depends=('sysvinit' 'networkmanager' 'acpid')
 install=x200-my.install
 source=('x200-my.initd'
-                'x200-my-lid.sh'
-                'x200-my-sleep.sh'
-                'x200-my.sh')
-sha512sums=('af5ade50214a9ffe0a24d0a0c8ad93d9802a6bfab64c53a832f0d21ef4abf9c465aec88e8be6b1af90c5bb02f9718aa3a495bcb8ed496f8de2c1ad130afdf70f'
+        'x200-my.confd'
+        'x200-my-lid.sh'
+        'x200-my-sleep.sh'
+        'x200-my.sh')
+sha512sums=('b8cab7790ecb542fa8aa930f26ac3f293bce772585643a0de189285415a0d7c12f5e9fb98602dd15ff9bb52afdc93acbcd658b153f1b9c1cb640646e55c3b73c'
+            '172d5def88c12118c9d736404bb7a028ee39578dd6f2dd632224e7c03ee30a34a19412725fb09c17f31aedc14846e0f2f0682f1d9077c4ff202bd7b7cf48c467'
             '0dc141f1a26f2cd570d49a05bcc9496ba4c49fde39afad46f5a0783e83c07ec810ca81454a28c3241bcffc62ac31274e2a8d726bbd3c1e91d8cf5315b783c3f8'
             '610564aa853c5dbc4e370ec2a4d3b5590e53ed235a1960927c0986a31f6c77d135086b1f5752b56fd511ea4a0294082fc7e98ee2fa7b69b37776a59f45c2ec34'
             'cb765075f02b5cd16bcfc31571cf7c31ddcd74ff3aa832df1acd96bd8feb62855c0cf90c31c3e0028180765a51eafc5c74fb1f0406dd9172bdc0f5ec02b39f8c')
@@ -22,6 +24,7 @@ package() {
   install -Dm755 x200-my.initd "$pkgdir"/etc/init.d/x200-my
   sed -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g' \
       -i $pkgdir/etc/init.d/x200-my
+  install -Dm644 "x200-my.confd" "$pkgdir/etc/conf.d/x200-my"
   install -Dm644 "x200-my-lid.sh" "$pkgdir/etc/acpi/events/x200-my-lid"
   install -Dm644 "x200-my-sleep.sh" "$pkgdir/etc/acpi/events/x200-my-sleep"
   install -Dm755 "x200-my.sh" "$pkgdir/etc/acpi/x200-my.sh"
diff --git a/x200-my.confd b/x200-my.confd
new file mode 100644
index 0000000..44312bc
--- /dev/null
+++ b/x200-my.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/x200-my: config file for /etc/init.d/x200-my
+
+# Options to pass to the x200-my daemon.
+
+PWMFREQ_RATE="0x8bb7b16dc5b6a"
diff --git a/x200-my.initd b/x200-my.initd
index 9d8442d..8edefd6 100644
--- a/x200-my.initd
+++ b/x200-my.initd
@@ -4,15 +4,20 @@
 
 description="Removes whining noise from Thinkpads X200 and powers off the wifi on shutdown."
 
-start() {
-if [ "${RC_CMD}" = "restart" ];
-  then
-    /usr/bin/nmcli radio all off
-  fi
+command="/usr/bin/intel_reg"
+pwmfreq="${PWMFREQ_RATE}"
+
+command_args="write 0x00061254 $pwmfreq"
 
-/usr/bin/intel_reg write 0x00061254 0x8bb7b16dc5b6a 2>/dev/null
+start() {
+    if [ "${RC_CMD}" = "restart" ];
+    then
+      /usr/bin/nmcli radio all off
+    fi
+    
+    exec $command $command_args 2>/dev/null
 }
 
 stop() {
-/usr/bin/nmcli radio all off
+    /usr/bin/nmcli radio all off
 }