[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. e8b6c9c9e069d3a603cbdfa204450bf953742563

[Darren Salt]

The following commit has been merged in the master branch:
commit 598a8b1b0ba3e93cb72b2abcfa3298e2b7dd4ce5
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Sun Mar 29 21:01:55 2009 +0100

    Put the cache file in /lib/init/rw.
    Unlike /var, that's guaranteed to be writable and mounted when udev starts.
    
    This also means that there are no files in /var to be purged and there's no
    need to re-run the cache creation script from the init script.

diff --git a/debian/eeepc-acpi-scripts.init b/debian/eeepc-acpi-scripts.init
index 7927e7c..1fa8f4f 100644
--- a/debian/eeepc-acpi-scripts.init
+++ b/debian/eeepc-acpi-scripts.init
@@ -48,15 +48,6 @@ case "$1" in
         ;;
     esac
 
-    # Run our udev action now.
-    # Running it when udev is started is too early; if we can avoid running
-    # that too early (we wait on something which indicates when /var is
-    # writable) then we can remove this.
-
-    log_action_begin_msg 'Initialising eeepc-acpi-scripts'
-    /lib/udev/eeepc-acpi-scripts - || log_failure_msg
-    log_action_end_msg 0
-
     # Now load the modules. We ignore failure since it's possible that
     # they're built into the running kernel.
 
diff --git a/debian/postrm b/debian/postrm
index c5b4690..32d01eb 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,14 +1,12 @@
 #!/bin/sh
 
 PKG=eeepc-acpi-scripts
-SOUND_FILE=/var/cache/$PKG/sound
 
 set -e
 
 case "$1" in
     purge)
         invoke-rc.d acpid restart>/dev/null
-        rm -f "$SOUND_FILE"
     ;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
         invoke-rc.d acpid restart>/dev/null
diff --git a/etc/acpi/lib/sound.sh b/etc/acpi/lib/sound.sh
index 9f2497b..4415676 100644
--- a/etc/acpi/lib/sound.sh
+++ b/etc/acpi/lib/sound.sh
@@ -4,7 +4,7 @@
 
 PKG=eeepc-acpi-scripts
 DEFAULT=/etc/default/$PKG
-SOUND_FILE=/var/cache/$PKG/sound
+SOUND_FILE=/lib/init/rw/$PKG.sound
 AMIXER=/usr/bin/amixer
 
 [ -e "$SOUND_FILE" ] && . "$SOUND_FILE"

-- 
Maintenance of eeepc-acpi-scripts debian package