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

[Ben Armstrong]

The following commit has been merged in the master branch:
commit 2a9384dd2cdbcf6b4d766a5bfbdaa09a1d33f69d
Author: Ben Armstrong <synrg at sanctuary.nslug.ns.ca>
Date:   Sun Sep 27 09:12:07 2009 -0300

    Reverted 3629e0

diff --git a/Changelog b/Changelog
index 62ea797..581e714 100644
--- a/Changelog
+++ b/Changelog
@@ -23,8 +23,6 @@
  * 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.
  * Start gmplayer fullscreen and with vorbis codec.
  * Associate default applications with demo file types.
  * Include irssi config to autojoin #debian-eeepc.
diff --git a/config/chroot_local-includes/etc/X11/X b/config/chroot_local-includes/etc/X11/X
deleted file mode 120000
index 7de6b02..0000000
--- a/config/chroot_local-includes/etc/X11/X
+++ /dev/null
@@ -1 +0,0 @@
-/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
deleted file mode 100644
index f1e0567..0000000
--- a/config/chroot_local-includes/etc/X11/xorg.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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 e0abcbf..7cd9869 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 gsynaptics
+iputils-ping less ssh-client briquolo zenity gpe-screenshot
diff --git a/scripts/config b/scripts/config
index 10e868a..8c7760a 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 noxautoconfig" \
+	--bootappend-live "noautologin" \
 	-k 686 \
 	-b usb-hdd \
 	--distribution lenny \

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