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

[Ben Armstrong]

The following commit has been merged in the master branch:
commit 3629e079f7baf01484c24f71d732a4d649e6de92
Author: Ben Armstrong <synrg at debian.org>
Date:   Sun Aug 2 21:08:48 2009 -0300

    Xorg configuration, support touchpad config

diff --git a/Changelog b/Changelog
index 5f053fa..b007c9e 100644
--- a/Changelog
+++ b/Changelog
@@ -23,6 +23,8 @@
  * Set briquolo to fullscreen.
  * Blacklist i2c_i801 to get rid of an unnecessary boot delay.
  * Specify the architecture else build will fail on non-i386.
+ * Configure Xorg instead of letting live-initramfs do it.
+ * Include gsynaptics to configure touchpad.
 
 1.0~b2
 ------
diff --git a/config/chroot_local-includes/etc/X11/X b/config/chroot_local-includes/etc/X11/X
new file mode 120000
index 0000000..7de6b02
--- /dev/null
+++ b/config/chroot_local-includes/etc/X11/X
@@ -0,0 +1 @@
+/usr/bin/Xorg
\ No newline at end of file
diff --git a/config/chroot_local-includes/etc/X11/xorg.conf b/config/chroot_local-includes/etc/X11/xorg.conf
new file mode 100644
index 0000000..f1e0567
--- /dev/null
+++ b/config/chroot_local-includes/etc/X11/xorg.conf
@@ -0,0 +1,66 @@
+# xorg.conf (X.Org X Window System server configuration file)
+#
+# This file was generated by dexconf, the Debian X Configuration tool, using
+# values from the debconf database.
+#
+# Edit this file with caution, and see the xorg.conf manual page.
+# (Type "man xorg.conf" at the shell prompt.)
+#
+# This file is automatically updated on xserver-xorg package upgrades *only*
+# if it has not been modified since the last upgrade of the xserver-xorg
+# package.
+#
+# If you have edited this file but would like it to be automatically updated
+# again, run the following command:
+#   sudo dpkg-reconfigure -phigh xserver-xorg
+
+Section "InputDevice"
+	Identifier	"Generic Keyboard"
+	Driver		"kbd"
+	Option		"XkbRules"	"xorg"
+	Option		"XkbModel"	"pc105"
+	Option		"XkbLayout"	"us"
+EndSection
+
+Section "InputDevice"
+	Identifier	"Configured Mouse"
+	Driver		"mouse"
+EndSection
+
+Section "InputDevice"
+        Identifier      "Synaptics Touchpad"
+        Driver          "synaptics"
+        Option          "CorePointer"
+        Option          "SendCoreEvents"        "true"
+        Option          "Device"                "/dev/input/mice"
+        Option          "Protocol"              "auto-dev"
+        Option          "HorizEdgeScroll"       "1"
+	Option		"SHMConfig"		"true"
+EndSection
+
+Section "Device"
+        Identifier      "Configured Video Device"
+        Option          "AccelMethod"   "XAA"
+EndSection
+
+Section "Monitor"
+        Identifier      "Generic Monitor"
+EndSection
+
+Section "Screen"
+        Identifier      "Default Screen"
+        Monitor         "Generic Monitor"
+        DefaultDepth    24
+        SubSection "Display"
+                Depth           24
+                Virtual         2048 2048
+        EndSubSection
+EndSection
+
+Section "Server Layout"
+	Identifier          "Default Layout"
+	Screen              "Default Screen"
+	InputDevice         "Generic Keyboard"
+	InputDevice         "Synaptics Touchpad"
+EndSection
+
diff --git a/config/chroot_local-packageslists/eeepc b/config/chroot_local-packageslists/eeepc
index bd4b56b..5b7d490 100644
--- a/config/chroot_local-packageslists/eeepc
+++ b/config/chroot_local-packageslists/eeepc
@@ -5,4 +5,4 @@ menu nano libgl1-mesa-dri bash-completion
 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
+iputils-ping less ssh-client briquolo zenity gpe-screenshot gsynaptics
diff --git a/scripts/config b/scripts/config
index 8c7760a..10e868a 100755
--- a/scripts/config
+++ b/scripts/config
@@ -6,7 +6,7 @@ MIRROR_SECURITY="http://debian.mirror.rafal.ca/debian-security/"
 lh_config noautoconfig \
 	--architecture i386 \
 	--apt-recommends disabled \
-	--bootappend-live "noautologin" \
+	--bootappend-live "noautologin noxautoconfig" \
 	-k 686 \
 	-b usb-hdd \
 	--distribution lenny \

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