[Debian-eeepc-commits] [SCM] A live-helper based Debian live & installer image for the Eee PC. branch, master, updated. 1.0b1-70-gb686867

[Ben Armstrong]

The following commit has been merged in the master branch:
commit b686867b2dbe73e703d09266a897f5bd3c74af68
Author: Ben Armstrong <synrg at debian.org>
Date:   Wed Dec 30 14:31:31 2009 -0400

    Revert SOUND_PREFER_MASTER=yes; fixed in git eeepc-acpi-scripts

diff --git a/Changelog b/Changelog
index dffcbd1..e817b1a 100644
--- a/Changelog
+++ b/Changelog
@@ -29,8 +29,6 @@
  * Include gsynaptics to configure touchpad.
  * Default wicd wireless interface to wlan0.
  * Correct gmplayer subtitle font config to eliminate warning.
- * Try SOUND_PREFER_MASTER=yes as default (will at least solve
-   sound hotkey breakage on model 4G).
  * Remove non-eee kernel modules to make some more room.
  * Allow overriding of the source repositories when building the image.
  * Include some packages for bluetooth testing.
diff --git a/config/chroot_local-hooks/eeepc.sh b/config/chroot_local-hooks/eeepc.sh
index 7121fce..7e9ac87 100755
--- a/config/chroot_local-hooks/eeepc.sh
+++ b/config/chroot_local-hooks/eeepc.sh
@@ -7,7 +7,6 @@ echo "HWCLOCKPARS=--directisa" >> /etc/default/rcS
 SCRIPTS_DEFAULTS=/etc/default/eeepc-acpi-scripts
 sed -i "s/ENABLE_OSD='no'/ENABLE_OSD='yes'/" $SCRIPTS_DEFAULTS
 sed -i "s/LOCK_SCREEN_ON_SUSPEND='yes'/LOCK_SCREEN_ON_SUSPEND='no'/" $SCRIPTS_DEFAULTS
-sed -i "s/SOUND_PREFER_MASTER=no/SOUND_PREFER_MASTER=yes/" $SCRIPTS_DEFAULTS
 echo "vf=screenshot" >> /etc/mplayer/mplayer.conf
 
 # Include some doc (iceweasel home page)

-- 
A live-helper based Debian live & installer image for the Eee PC.