[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 503190a539a85757c00affd69a7ab9037753404a

[Luca Capello]

The following commit has been merged in the master branch:
commit 503190a539a85757c00affd69a7ab9037753404a
Author: Luca Capello <luca at pca.it>
Date:   Tue Apr 7 13:02:43 2009 +0200

    install.sh: add user variable DISPLAY_MANAGER

diff --git a/install.sh b/install.sh
index 4dfd118..93e34ce 100755
--- a/install.sh
+++ b/install.sh
@@ -43,6 +43,7 @@ lc () {
 APT_OPTIONS=${APT_OPTIONS:- --yes}
 APT_RECOMMENDS=${APT_RECOMMENDS:-false}
 DASH_BINSH=${DASH_BINSH:-true}
+DISPLAY_MANAGER=${DISPLAY_MANAGER:-nodm}
 EXTRA_TASKS=""
 FSO_MIRROR=${FSO_MIRROR:-http://pkg-fso.alioth.debian.org/debian}
 FSO_DEVICE=${FSO_DEVICE:-gta02}
@@ -91,7 +92,7 @@ CDEBOOTSTRAP_EXCLUDE_PACKAGES=hello
 
 # fso-specific packages
 # With work around for some APT/aptitude bug (http://bugs.debian.org/435662)
-FSO_PACKAGES="nodm matchbox-window-manager zhone fso-frameworkd fso-gpsd openmoko-panel-plugin dbus-x11 trayer fso-utils mtd-utils \
+FSO_PACKAGES="matchbox-window-manager zhone fso-frameworkd fso-gpsd openmoko-panel-plugin dbus-x11 trayer fso-utils mtd-utils \
 xserver-xorg-video-fbdev xserver-xorg-input-tslib xterm xinit xfonts-base x11-xserver-utils \
 xserver-xorg-input-all- xserver-xorg-input-synaptics- xserver-xorg-input-wacom- xserver-xorg-video-all- xserver-xorg-video-v4l- xserver-xorg-video-voodoo- xserver-xorg-video-vga- xserver-xorg-video-vesa- xserver-xorg-video-tseng- xserver-xorg-video-trident- xserver-xorg-video-tga- xserver-xorg-video-tdfx- xserver-xorg-video-sisusb- xserver-xorg-video-sis- xserver-xorg-video-siliconmotion- xserver-xorg-video-savage- xserver-xorg-video-s3virge- xserver-xorg-video-s3- xserver-xorg-video-rendition- xserver-xorg-video-radeonhd- xserver-xorg-video-nv- xserver-xorg-video-nsc- xserver-xorg-video-neomagic- xserver-xorg-video-mga- xserver-xorg-video-imstt- xserver-xorg-video-i740- xserver-xorg-video-i128- xserver-xorg-video-glint- xserver-xorg-video-dummy- xserver-xorg-video-cyrix- xserver-xorg-video-chips- xserver-xorg-video-ati- xserver-xorg-video-radeon- xserver-xorg-video-mach64- xserver-xorg-video-r128- xserver-xorg-video-cirrus- xserver-xorg-video-ark- xserver-xorg-video-apm-"
 
@@ -268,6 +269,11 @@ ENVIRONMENT
 	TESTHOST     name of machine that should be tested for availability
                      (set to '$TESTHOST')
 	VERBOSE      increase amount of information that is forwarded to stdout
+	DISPLAY_MANAGER  choose the Display Manager to be installed
+                     (default to nodm, possible values are any *dm
+                     package in the Debian archive, which could require
+                     a LOT of disk space; set to none if you do not
+                     want a Display Manager)
 
     Stages:
 
@@ -1061,6 +1067,13 @@ EOMATCHBOX
 plugins = buttons, gsm, wifi, gps, keyboard, brightness, screenlock, bluetooth
 EOPANELPLUGIN
 
+	if [ "$DISPLAY_MANAGER" = none ]; then
+		echo " * Not installing the Display Manager"
+	else
+		echo " * Installing Display Manager $DISPLAY_MANAGER"
+		chroot "$INST_DIR" apt-get $APT_OPTIONS install $DISPLAY_MANAGER
+	fi
+
 	echo "I: System configured"
 }
 

-- 
Various non-packaged files