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

Ben Armstrong synrg at debian.org
Wed Dec 30 15:41:24 UTC 2009


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

    add bluetooth; wifi suspend & acpi_osi workarounds

diff --git a/Changelog b/Changelog
index 10f9fec..dffcbd1 100644
--- a/Changelog
+++ b/Changelog
@@ -33,6 +33,11 @@
    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.
+ * Add pm-utils eeepc-wlan.sh suspend hook to workaround wifi not
+   working after suspend for some models (rt2860sta).
+ * Append acpi_osi="Linux" to workaround eeepc_laptop not loading on some newer
+   models with newer BIOS (e.g. 1002HA).
 
 1.0~b2
 ------
diff --git a/config/chroot_local-hooks/rm-non-eee-kernel-modules.sh b/config/chroot_local-hooks/rm-non-eee-kernel-modules.sh
index c7ecfbb..4e427b1 100755
--- a/config/chroot_local-hooks/rm-non-eee-kernel-modules.sh
+++ b/config/chroot_local-hooks/rm-non-eee-kernel-modules.sh
@@ -1,4 +1,5 @@
 #!/bin/sh -e
+exit 0 # Disabled for now until we're certain which modules to strip
 cd /lib/modules/*/kernel
 find \
 	arch/x86/kernel/cpu/cpufreq \
diff --git a/config/chroot_local-includes/etc/pm/suspend.d/eeepc-wlan.sh b/config/chroot_local-includes/etc/pm/suspend.d/eeepc-wlan.sh
new file mode 100755
index 0000000..91f521c
--- /dev/null
+++ b/config/chroot_local-includes/etc/pm/suspend.d/eeepc-wlan.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# Action script to enable/disable wireless interface
+# the problem is that if the interface is enabled when suspending,
+# the kernel locks up during resume
+#
+#
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+if [ ! -r /usr/share/eeepc-acpi-scripts/functions.sh ]; then
+	exit 0
+fi
+
+OLD_STATE_FILE=/var/run/wlan-state
+WLAN_CTRL=/etc/acpi/actions/wireless.sh
+
+# pm-action(8) - <action> <suspend method>
+#
+# On suspend|hibernate, disable wlan
+# re-enable on resume (if it was enabled during suspend).
+
+case "${1}" in
+        suspend|hibernate)
+		$WLAN_CTRL detect
+                if [ $? = "1" ] ; then
+			OLD_STATE=on
+		else
+			OLD_STATE=off
+		fi
+		echo $OLD_STATE > $OLD_STATE_FILE
+		if [ "$OLD_STATE" = "on" ]; then
+			$WLAN_CTRL off
+		fi
+                ;;
+        resume|thaw)
+                OLD_STATE=$( cat $OLD_STATE_FILE )
+		if [ ${OLD_STATE:-off} = "on" ]; then
+			$WLAN_CTRL on
+		fi
+                ;;
+esac
+
diff --git a/config/chroot_local-packageslists/eeepc.list b/config/chroot_local-packageslists/eeepc.list
index 5b7d490..dd908ae 100644
--- a/config/chroot_local-packageslists/eeepc.list
+++ b/config/chroot_local-packageslists/eeepc.list
@@ -6,3 +6,4 @@ lxde dhcp3-client wicd aosd-cat hal iceweasel alsa-base alsa-utils
 irssi mplayer
 gksu synaptic cpufrequtils acpi gparted netcat wget aptitude
 iputils-ping less ssh-client briquolo zenity gpe-screenshot gsynaptics
+bluetooth bluez obexpushd
diff --git a/scripts/config b/scripts/config
index 23f2008..2dec96b 100755
--- a/scripts/config
+++ b/scripts/config
@@ -6,7 +6,7 @@ MIRROR_SECURITY="${2:-http://debian.mirror.rafal.ca/debian-security/}"
 lh config noautoconfig \
 	--architecture i386 \
 	--apt-recommends false \
-	--bootappend-live "noautologin" \
+	--bootappend-live 'noautologin acpi_osi="Linux"' \
 	-k 686 \
 	-b usb-hdd \
 	--distribution squeeze \

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



More information about the Debian-eeepc-commits mailing list