From 8421bbd25885a670de6b616da12711b5dcf68e1b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 14:46:27 +0200 Subject: Adding casper 1.77+debian-5. --- scripts/casper | 62 +++++++++--------- scripts/casper-bottom/14locales | 1 + scripts/casper-bottom/19keyboard | 15 ++--- scripts/casper-bottom/20xconfig | 22 ++++++- scripts/casper-bottom/24preseed | 33 +++------- scripts/casper-bottom/30accessibility | 115 +++++++++++++++++----------------- 6 files changed, 130 insertions(+), 118 deletions(-) (limited to 'scripts') 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 < /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 <