Adding casper 1.66+debian-1.

8 files changed, 57 insertions, 30 deletions

diff --git a/scripts/casper b/scripts/casper
index 61e579c..3e4ed06 100644
--- a/scripts/casper
+++ b/scripts/casper
@@ -23,12 +23,19 @@ home_persistence="home-rw"
 USERNAME="casper"
 USERFULLNAME="Live session user"
 HOST="live"
+BUILD_SYSTEM="Debian"
 
 mkdir -p $mountpoint
 
 [ -f /etc/casper.conf ] && . /etc/casper.conf
 
-export USERNAME USERFULLNAME HOST
+export USERNAME USERFULLNAME HOST BUILD_SYSTEM
+
+if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+    MP_QUIET="-Q"
+else
+    MP_QUIET="-q"
+fi
 
 # looking for casper specifics options as kernel parameters
 for x in $(cat /proc/cmdline); do
@@ -133,7 +140,7 @@ setup_loop() {
     local module=$2
     local pattern=$3
 
-    modprobe -qb "$module"
+    modprobe "${MP_QUIET}" -b "$module"
     udevsettle
 
     for loopdev in $pattern; do
@@ -164,7 +171,7 @@ setup_devmapper() {
     backdev="$1"
     rootmnt="$2"
 
-    modprobe -qb dm-mod
+    modprobe "${MP_QUIET}" -b dm-mod
     COW_DEVICE=/dev/ram1
     COW_NAME="casper-cow"
 
@@ -267,7 +274,7 @@ find_cow_device() {
 do_netmount() {
     rc=1
 
-    modprobe -q af_packet # For DHCP
+    modprobe "${MP_QUIET}" af_packet # For DHCP
 
     ipconfig ${DEVICE} /tmp/net-${DEVICE}.conf
 
@@ -291,7 +298,7 @@ do_netmount() {
 
 do_nfsmount() {
     rc=1
-    modprobe -q nfs
+    modprobe "${MP_QUIET}" nfs
     if [ -z "${NFSOPTS}" ]; then
         NFSOPTS=""
     fi
@@ -315,7 +322,7 @@ do_cifsmount() {
         fi
 
         [ "$quiet" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
-        modprobe -q cifs
+        modprobe "${MP_QUIET}" cifs
 
         if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}" ; then
             rc=0
@@ -328,7 +335,7 @@ setup_unionfs() {
     image_directory="$1"
     rootmnt="$2"
 
-    modprobe -qb unionfs
+    modprobe "${MP_QUIET}" -b unionfs
 
     # run-init can't deal with this, but we're going to move all of these
     # away before it runs anyway.
diff --git a/scripts/casper-bottom/10adduser b/scripts/casper-bottom/10adduser
index 700f8c3..e85f947 100755
--- a/scripts/casper-bottom/10adduser
+++ b/scripts/casper-bottom/10adduser
@@ -20,18 +20,28 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
+if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+    user_crypted="8Ab05sVQ4LLps" # as in `echo "live" | mkpasswd -s`
+else
+    user_crypted="U6aMy0wojraho" # "ubuntu"
+fi
+
 # U6aMy0wojraho is just a blank password
 chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
 set passwd/root-password-crypted *
-set passwd/user-password-crypted UMxWpqk1F1hww
-set passwd/user-fullname $USERFULLNAME 
+set passwd/user-password-crypted ${user_crypted}
+set passwd/user-fullname $USERFULLNAME
 set passwd/username $USERNAME
 set passwd/user-uid 999
 EOF
 
-chroot /root /usr/bin/env -i HOME="/root" \
-       TERM="${TERM}" PATH="/usr/sbin:/usr/bin:/sbin:/bin" \
-       /usr/lib/user-setup/user-setup-apply > /dev/null
+if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+    chroot /root /usr/bin/env -i HOME="/root" \
+        TERM="${TERM}" PATH="/usr/sbin:/usr/bin:/sbin:/bin" \
+        /usr/lib/user-setup/user-setup-apply > /dev/null
+else
+    chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
+fi
 
 # Clear out debconf database again to avoid confusing ubiquity later.
 chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
@@ -43,17 +53,16 @@ set passwd/user-uid
 EOF
 
 if [ -f /root/etc/sudoers ]; then
-	if [ -x /sbin/udevplug ]; then 
-		# FIXME: ugly hack, admin is not present in debian so we do here ubuntu stuff
-		# XXX - awful hack to stop xscreensaver locking the screen (#7150)
-		echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
+    if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+        # XXX - awful hack to stop xscreensaver locking the screen (#7150)
+        echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
         grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin  ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
-		for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop; do
-		    if [ -f "/root/$file" ]; then
-		        chroot /root install -D -o $USERNAME -g $USERNAME $file /home/$USERNAME/Desktop/$(basename "$file")
-	        	break
-    		fi
-		done
+        for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop; do
+            if [ -f "/root/$file" ]; then
+                chroot /root install -D -o $USERNAME -g $USERNAME $file /home/$USERNAME/Desktop/$(basename "$file")
+                break
+            fi
+        done
     else # We are in debian :-)
         echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers	    
     fi
diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales
index ebe7616..f69fa0f 100755
--- a/scripts/casper-bottom/14locales
+++ b/scripts/casper-bottom/14locales
@@ -27,6 +27,10 @@ elif [ -e /root/etc/environment ]; then # Old locales policy
 	grep_file=/root/etc/environment
 fi
 
+if [ -z "${grep_file}" ]; then 
+	grep_file=/root/etc/default/locale
+fi
+
 # commandline
 for x in $(cat /proc/cmdline); do
 	case $x in
@@ -49,8 +53,12 @@ fi
 
 if [ "${set_locale}" ]; then
 	LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
-	printf 'LANG="%s"\n' "${LANG}" >> "${grep_file}" 
-	chroot /root /usr/sbin/locale-gen "${LANG}"
+	printf 'LANG="%s"\n' "${LANG}" >> "${grep_file}"
+	if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+		chroot /root /usr/sbin/locale-gen
+	else
+		chroot /root /usr/sbin/locale-gen "${LANG}"
+	fi
 fi
 
 log_end_msg
diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
index 745e6ce..ff88721 100755
--- a/scripts/casper-bottom/15autologin
+++ b/scripts/casper-bottom/15autologin
@@ -27,8 +27,11 @@ else
 fi
 
 if chroot /root [ -f ${GDMCONF} ]; then
-	# true hack ! -- nohar
-    chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
+    if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+        # true hack ! -- nohar
+        chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
+    fi
+
     # Configure GDM autologin
     chroot /root sed -i \
         -e "s/^AutomaticLoginEnable=.*\$/AutomaticLoginEnable=true/" \
diff --git a/scripts/casper-bottom/22gnome_panel_data b/scripts/casper-bottom/22gnome_panel_data
index e87c94f..5509ce1 100755
--- a/scripts/casper-bottom/22gnome_panel_data
+++ b/scripts/casper-bottom/22gnome_panel_data
@@ -28,7 +28,7 @@ fi
 
 panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-panel-data 2>/dev/null) || panel_version=""
 if [ -n "$panel_version" ]; then
-    chroot /root su $USERNAME -- gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
+    chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
 fi
 
 log_end_msg
diff --git a/scripts/casper-bottom/22screensaver b/scripts/casper-bottom/22screensaver
index 2a98b1a..6719f5f 100755
--- a/scripts/casper-bottom/22screensaver
+++ b/scripts/casper-bottom/22screensaver
@@ -22,7 +22,7 @@ log_begin_msg "$DESCRIPTION"
 
 gnome_screensaver_version=$(chroot /root dpkg-query -W --showformat='${Version}' gnome-screensaver 2>/dev/null) || gnome_screensaver_version=""
 if [ -n "$gnome_screensaver_version" ]; then
-    chroot /root su $USERNAME -- gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
+    chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
 fi
 
 log_end_msg
diff --git a/scripts/casper-bottom/30accessibility b/scripts/casper-bottom/30accessibility
index c6015e1..8352fb6 100755
--- a/scripts/casper-bottom/30accessibility
+++ b/scripts/casper-bottom/30accessibility
@@ -21,7 +21,7 @@ esac
 log_begin_msg "$DESCRIPTION"
 
 gct() {
-    chroot /root su $USERNAME -- gconftool-2 "$@"
+    chroot /root sudo -u "$USERNAME" gconftool-2 "$@"
 }
 
 for x in $(cat /proc/cmdline); do
diff --git a/scripts/casper-bottom/32disable_hibernation b/scripts/casper-bottom/32disable_hibernation
index 7b7d976..badcef6 100755
--- a/scripts/casper-bottom/32disable_hibernation
+++ b/scripts/casper-bottom/32disable_hibernation
@@ -24,7 +24,7 @@ log_begin_msg "$DESCRIPTION"
 gpm_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-power-manager 2>/dev/null) || panel_version=""
 if [ -n "$gpm_version" ]; then
     casper-reconfigure /root gnome-power-manager
-    chroot /root su $USERNAME -- gconftool-2 -s -t bool /apps/gnome-power-manager/can_hibernate false
+    chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/can_hibernate false
 fi
 
 if [ -f /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/kcmlaptoprc ]; then