From: Daniel Baumann Date: Sun, 18 Apr 2010 16:41:00 +0000 (+0200) Subject: Adding upstream version 1.65+debian. X-Git-Tag: upstream/1.65+debian^0 X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=4ba0eb3afcc7796339ae37b7d736296f28b43587;p=live-boot-grml.git Adding upstream version 1.65+debian. --- diff --git a/scripts/casper b/scripts/casper index 3e7db03..bb8a7ee 100644 --- a/scripts/casper +++ b/scripts/casper @@ -91,7 +91,7 @@ setup_loop() { local pattern=$3 modprobe -Qb "$module" - udevplug -W + udevsettle for loopdev in $pattern; do if [ "$(cat $loopdev/size)" -eq 0 ]; then @@ -189,8 +189,9 @@ setup_unionfs() { rootmnt="$2" modprobe -Qb unionfs - croot="" # Should really be /casper, but run-init doesn't handle - # mount-points in subdirectories at all + # run-init can't deal with this, but we're going to move all of these + # away before it runs anyway. + croot="/casper" # Let's just mount the read-only file systems first mkdir -p "${croot}" @@ -232,9 +233,8 @@ setup_unionfs() { mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt" for d in $(mount -t squashfs | cut -d\ -f 3); do - mkdir -p "${rootmnt}/casper/${d}" - mount -o bind "${d}" "${rootmnt}/${d}" - umount "${d}" + mkdir -p "${rootmnt}/casper/${d##*/}" + mount -o move "${d}" "${rootmnt}/casper/${d##*/}" done if grep -q show-cow /proc/cmdline; then diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales index 0d4e171..ebe7616 100755 --- a/scripts/casper-bottom/14locales +++ b/scripts/casper-bottom/14locales @@ -34,6 +34,10 @@ for x in $(cat /proc/cmdline); do locale=${x#debian-installer/locale=} set_locale="true" ;; + locale=*) + locale=${x#locale=} + set_locale="true" + ;; esac done diff --git a/scripts/casper-bottom/20xconfig b/scripts/casper-bottom/20xconfig index 840200d..b8a4552 100755 --- a/scripts/casper-bottom/20xconfig +++ b/scripts/casper-bottom/20xconfig @@ -33,6 +33,9 @@ for x in $(cat /proc/cmdline); do debian-installer/locale=*) locale=${x#debian-installer/locale=} ;; + locale=*) + locale=${x#locale=} + ;; esac done diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking index 021aca9..fc015b0 100755 --- a/scripts/casper-bottom/23networking +++ b/scripts/casper-bottom/23networking @@ -27,7 +27,7 @@ iface lo inet loopback EOF -udevplug -Bpci -Iclass="0x02*" +udevtrigger -Bpci -Iclass="0x02*" for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*; do [ -e $interface ] || continue diff --git a/scripts/casper-bottom/24preseed b/scripts/casper-bottom/24preseed index 468ec2e..98a9864 100755 --- a/scripts/casper-bottom/24preseed +++ b/scripts/casper-bottom/24preseed @@ -31,6 +31,10 @@ for x in $(cat /proc/cmdline); do value="${x#*=}" casper-preseed /root "$question" "$value" ;; + locale=*) + value="${x#*=}" + casper-preseed /root debian-installer/locale "$value" + ;; esac done diff --git a/ubiquity-hooks/30accessibility b/ubiquity-hooks/30accessibility new file mode 100755 index 0000000..ab1c2e9 --- /dev/null +++ b/ubiquity-hooks/30accessibility @@ -0,0 +1,66 @@ +#!/bin/sh + +. /usr/share/debconf/confmodule + +PREREQ="" +DESCRIPTION="Configuring accessibility options..." +USERNAME=$(db_get passwd/username) + +gct() { + chroot /target su $USERNAME -- gconftool-2 "$@" +} + +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 + ;; + # 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 [gnopernicus] + gct -s -t bool /apps/gnopernicus/srcore/mag_active true + gct -s -t bool /apps/gnopernicus/srcore/sp_active false + ;; + # 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 [gnopernicus] + 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 + ;; + # Motor Difficulties - pointing devices + access=m2) + gct -s -t bool /desktop/gnome/accessibility/keyboard/enable 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 bool /desktop/gnome/interface/accessibility true + gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats gok + ;; + esac +done