Adding casper 1.77+debian-5.

6 files changed, 130 insertions, 118 deletions

diff --git a/scripts/casper b/scripts/casper
index f932c65..8cfc0df 100644
--- a/scripts/casper
+++ b/scripts/casper
@@ -29,6 +29,7 @@ fi
 
 parse_cmdline ()
 {
+    PRESEEDS=
     # looking for casper specifics options as kernel parameters
     for x in $(cat /proc/cmdline); do
         case $x in
@@ -46,14 +47,20 @@ parse_cmdline ()
                 ;;
             netboot*)
                 export NETBOOT=${x#netboot=} ;;
+            access=*)
+                export ACCESS=${x#access=} ;;
+            xdebconf)
+                export XDEBCONF="Yes" ;;
             toram)
-                export TORAM=1 ;;
+                export TORAM="Yes" ;;
             todisk=*)
                 export TODISK=${x#todisk=} ;;
             showmounts)
-                export SHOWMOUNTS=1 ;;
+                export SHOWMOUNTS="Yes" ;;
             persistent)
-                export PERSISTENT=1 ;;
+                export PERSISTENT="Yes" ;;
+            nopersistent)
+                export PERSISTENT="" ;;
             ip*)
                 STATICIP=${x#ip=}
                 if [ "${STATICIP}" == "" ]; then
@@ -62,28 +69,31 @@ parse_cmdline ()
                 export STATICIP ;;
             casper-getty)
                 export CASPERGETTY=1 ;;
-            console=*)
-                export DEFCONSOLE=$(sed -e 's%.*console=%console=%' /proc/cmdline) ;;
-            bootfrom=*)
-                export LIVEMEDIA=${x#bootfrom=} ;;
-            live-media=*)
-                export LIVEMEDIA=${x#live-media=} ;;
+            bootfrom=*|live-media=*)
+                export LIVEMEDIA=${x#*=} ;;
             live-media-timeout=*)
                 export LIVEMEDIA_TIMEOUT=${x#live-media-timeout=} ;;
-            debian-installer/locale=*)
-                export LOCALE=${x#debian-installer/locale=} ;;
-            locale=*)
-                export LOCALE=${x#locale=} ;;
-            kbd-chooser/method=*)
-                export KBD=${x#kbd-chooser/method=} ;;
-            keyb=*)
-                export KBD=${x#keyb=} ;;
-            console-setup/layoutcode=*)
-                export CSLAYOUT=${x#console-setup/layoutcode=} ;;
-            console-setup/variantcode=*)
-                export CSVARIANT=${x#console-setup/variantcode=} ;;
-            console-setup/modelcode=*)
-                export CSMODEL=${x#console-setup/modelcode=} ;;
+            locale=*|debian-installer/locale=*)
+                export LOCALE=${x#*=} ;;
+            keyb=*|kbd-chooser/method=*)
+                export KBD=${x#*=} ;;
+            klayout=*|console-setup/layoutcode=*)
+                export KLAYOUT=${x#*=} ;;
+            koptions=*)
+                export KOPTIONS=${x#koptions=} ;;
+            kvariant=*|console-setup/variantcode=*)
+                export KVARIANT=${x#*=} ;;
+            kmodel=*|console-setup/modelcode=*)
+                export KMODEL=${x#*=} ;;
+            preseed/file=*|file=*)
+                export LOCATION="${x#*=}" ;;
+            */*=*)
+                question="${x%%=*}"
+                value="${x#*=}"
+                PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
+                ;;
+            console=*)
+                export DEFCONSOLE=$(sed -e 's%.*console=%console=%' /proc/cmdline) ;;
         esac
     done
 
@@ -601,12 +611,6 @@ mountroot() {
     run_scripts /scripts/casper-bottom
     [ "$quiet" != "y" ] && log_end_msg
 
-    if [ -f /casper.vars ]; then
-        echo "Casper vars:"
-        cat /casper.vars
-    fi
-
-    echo "Casper Log:"
     exec 1>&6 6>&-
     exec 2>&7 7>&-
     cp casper.log "${rootmnt}/var/log/"
diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales
index 102051b..18ed15e 100755
--- a/scripts/casper-bottom/14locales
+++ b/scripts/casper-bottom/14locales
@@ -69,6 +69,7 @@ if [ "${set_locale}" ]; then
     if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
         printf 'LANG="%s"\n' "${LANG}" > "${grep_file}"
         chroot /root /usr/sbin/locale-gen "${LANG}"
+        casper-preseed /root debian-installer/locale "${locale}"
     else
         printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
         printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
diff --git a/scripts/casper-bottom/19keyboard b/scripts/casper-bottom/19keyboard
index fc2baf9..40834d8 100755
--- a/scripts/casper-bottom/19keyboard
+++ b/scripts/casper-bottom/19keyboard
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PREREQ=""
-DESCRIPTION="Setting up keyboard..."
+DESCRIPTION="Setting up console keyboard..."
 
 . /scripts/casper-functions
 
@@ -34,14 +34,14 @@ fi
 
 really_export kbd
 
-if [ -n "${CSLAYOUT}" ]; then
-    cslayout="${CSLAYOUT}"
+if [ -n "${KLAYOUT}" ]; then
+    cslayout="${KLAYOUT}"
 fi
-if [ -n "${CSVARIANT}" ]; then
-    csvariant="${CSVARIANT}"
+if [ -n "${KVARIANT}" ]; then
+    csvariant="${KVARIANT}"
 fi
-if [ -n "${CSMODEL}" ]; then
-    csmodel="${CSMODEL}"
+if [ -n "${KMODEL}" ]; then
+    csmodel="${KMODEL}"
 fi
 
 if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
@@ -68,5 +68,6 @@ if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
 else
         chroot /root /usr/sbin/install-keymap $kbd
         casper-preseed /root debian-installer/keymap "$kbd"
+        casper-preseed /root kbd-chooser/method "$kbd"
 fi
 log_end_msg
diff --git a/scripts/casper-bottom/20xconfig b/scripts/casper-bottom/20xconfig
index 98d2929..470f54c 100755
--- a/scripts/casper-bottom/20xconfig
+++ b/scripts/casper-bottom/20xconfig
@@ -30,6 +30,11 @@ fi
 mount -n -o bind /sys /root/sys
 mount -n -o bind /proc /root/proc
 
+if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]; then
+    # xdebconfigurator
+    chroot /root /usr/sbin/xdebconfigurator
+fi
+
 if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
     chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
 set xserver-xorg/autodetect_keyboard true
@@ -37,7 +42,22 @@ fset xserver-xorg/autodetect_keyboard seen true
 EOF
 else
     # d-i code not present, so:
-    echo "set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}" | chroot /root debconf-communicate -fnoninteractive casper > /dev/null
+    if [ -n "${KOPTIONS}" ]; then
+        setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
+    fi
+    if [ -n "${KVARIANT}" ]; then
+        setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
+    fi
+    if [ -n "${KMODEL}" ]; then
+        setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
+    fi
+
+    chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
+set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
+${setvariant}
+${setmodel}
+${setoptions}
+EOF
 fi
 
 DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 casper-reconfigure /root xserver-xorg
diff --git a/scripts/casper-bottom/24preseed b/scripts/casper-bottom/24preseed
index cd52467..b4aac4c 100755
--- a/scripts/casper-bottom/24preseed
+++ b/scripts/casper-bottom/24preseed
@@ -20,29 +20,16 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-location=
-for x in $(cat /proc/cmdline); do
-	case $x in
-		preseed/file=*)
-			location="${x#preseed/file=}"
-			;;
-		file=*)
-			location="${x#file=}"
-			;;
-		*/*=*)
-			question="${x%%=*}"
-			value="${x#*=}"
-			casper-preseed /root "$question" "$value"
-			;;
-		locale=*)
-			value="${x#*=}"
-			casper-preseed /root debian-installer/locale "$value"
-			;;
-	esac
-done
-
-if [ "$location" ]; then
-	chroot /root debconf-set-selections < "/root$location"
+if [ -f "/root/${LOCATION}" ]; then
+    chroot /root debconf-set-selections < "/root/${LOCATION}"
+fi
+
+if [ -n "${PRESEEDS}" ]; then
+    for preseed in ${PRESEEDS}; do
+    	question="${preseed%%=*}"
+		value="${preseed#*=}"
+		casper-preseed /root "${question}" "${value}"
+	done
 fi
 
 log_end_msg
diff --git a/scripts/casper-bottom/30accessibility b/scripts/casper-bottom/30accessibility
index 8cd633b..943f5a0 100755
--- a/scripts/casper-bottom/30accessibility
+++ b/scripts/casper-bottom/30accessibility
@@ -34,66 +34,65 @@ kderc_addtoprefixes() {
     fi
 }
 
-for x in $(cat /proc/cmdline); do
-                case $x in
-                        # Lesser Visual Impairment
-                        access=v1)
-                        gct -s -t string /desktop/gnome/interface/gtk_theme HighContrastLargePrint
-                        gct -s -t string /desktop/gnome/interface/icon_theme HighContrast
-                        gct -s -t string /desktop/gnome/interface/monospace_font_name "monospace 18"
-                        gct -s -t string /desktop/gnome/interface/font_name "sans 18"
-                        gct -s -t string /apps/metacity/general/theme Atlanta
-                        gct -s -t string /desktop/gnome/background/picture_filename ""
-                        gct -s -t string /desktop/gnome/background/picture_options none
-                        gct -s -t string /desktop/gnome/background/primary_color \#666666
-                        gct -s -t string /desktop/gnome/background/secondary_color \#7F7F7F
-                        gct -s -t string /desktop/gnome/background/color_shading_type solid
-                        gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
-                        gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
+case ${ACCESS} in
+    # Lesser Visual Impairment
+    v1)
+        gct -s -t string /desktop/gnome/interface/gtk_theme HighContrastLargePrint
+        gct -s -t string /desktop/gnome/interface/icon_theme HighContrast
+        gct -s -t string /desktop/gnome/interface/monospace_font_name "monospace 18"
+        gct -s -t string /desktop/gnome/interface/font_name "sans 18"
+        gct -s -t string /apps/metacity/general/theme Atlanta
+        gct -s -t string /desktop/gnome/background/picture_filename ""
+        gct -s -t string /desktop/gnome/background/picture_options none
+        gct -s -t string /desktop/gnome/background/primary_color \#666666
+        gct -s -t string /desktop/gnome/background/secondary_color \#7F7F7F
+        gct -s -t string /desktop/gnome/background/color_shading_type solid
+        gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
+        gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
 
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
-                        ;;
-                        # Moderate Visual Impairment
-                        access=v2)
-                        gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
-                        #gct -s -t bool /apps/gnopernicus/srcore/mag_active true
-                        #gct -s -t bool /apps/gnopernicus/srcore/sp_active false
+        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
+        ;;
+    # Moderate Visual Impairment
+    v2)
+        gct -s -t bool /desktop/gnome/interface/accessibility true
+        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
+        #gct -s -t bool /apps/gnopernicus/srcore/mag_active true
+        #gct -s -t bool /apps/gnopernicus/srcore/sp_active false
 
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
-                        ;;
-                        # Blindness
-                        access=v3)
-                        gct -s -t bool /desktop/gnome/sound/enable_esd false
-                        gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
-                        #gct -s -t bool /apps/gnopernicus/srcore/sp_active true
-                        #gct -s -t bool /apps/gnopernicus/srcore/mag_active false
-                        ;;
-                        # Minor Motor Difficulties
-                        access=m1)
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/mousekeys_enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep true
-                        gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
-                        gct -s -t bool /desktop/gnome/peripherals/keyboard/repeat true
-                        gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
-                        gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
+        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
+        ;;
+    # Blindness
+    v3)
+        gct -s -t bool /desktop/gnome/sound/enable_esd false
+        gct -s -t bool /desktop/gnome/interface/accessibility true
+        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
+        #gct -s -t bool /apps/gnopernicus/srcore/sp_active true
+        #gct -s -t bool /apps/gnopernicus/srcore/mag_active false
+        ;;
+        # Minor Motor Difficulties
+    m1)
+        gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
+        gct -s -t bool /desktop/gnome/accessibility/keyboard/mousekeys_enable true
+        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
+        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep true
+        gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
+        gct -s -t bool /desktop/gnome/peripherals/keyboard/repeat true
+        gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
+        gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
 
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
-                        ;;
-                        # Motor Difficulties - pointing devices
-                        access=m2)
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
-			gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep false
-                        gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
-                        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
+        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
+        ;;
+    # Motor Difficulties - pointing devices
+    m2)
+        gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
+        gct -s -t bool /desktop/gnome/interface/accessibility true
+        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
+        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep false
+        gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
+        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
+
+        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
+        ;;
+esac
 
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
-                        ;;
-		esac
-done
 log_end_msg