diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 19 | ||||
| -rwxr-xr-x | scripts/live-bottom/15autologin | 2 | ||||
| -rwxr-xr-x | scripts/live-bottom/19keyboard | 2 | ||||
| -rwxr-xr-x | scripts/live-bottom/25configure_init | 15 | ||||
| -rwxr-xr-x | scripts/live-bottom/30accessibility | 16 | ||||
| -rwxr-xr-x | scripts/live-premount/10driver_updates | 2 |
6 files changed, 53 insertions, 3 deletions
diff --git a/scripts/live b/scripts/live index d52ae7c..f539f52 100755 --- a/scripts/live +++ b/scripts/live @@ -201,6 +201,25 @@ parse_cmdline () export LOCATION ;; + url=*) + LOCATION="${x#url=}" + + mount -n -o bind /sys /root/sys + mount -n -o bind /proc /root/proc + mount -n -o bind /dev /root/dev + + mkdir -p /root/var/run/network + chroot /root ifup -a + chroot /root wget -P /tmp "$location" + chroot /root ifdown -a + + umount /root/sys + umount /root/proc + umount /root/dev + + LOCATION="/tmp/$(basename "$location")" + ;; + */*=*) question="${x%%=*}" value="${x#*=}" diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin index f15f033..4de38f9 100755 --- a/scripts/live-bottom/15autologin +++ b/scripts/live-bottom/15autologin @@ -29,12 +29,14 @@ log_begin_msg "Setting up automatic login..." if [ -z "${NOXAUTOLOGIN}" ] then +# chroot needed to handle symlinks correctly if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]; then GDMCONF=/etc/gdm/gdm-cdd.conf else GDMCONF=/etc/gdm/gdm.conf fi +# chroot needed to handle symlinks correctly if chroot /root [ -f ${GDMCONF} ]; then if [ "${BUILD_SYSTEM}" = "Debian" ]; then # true hack ! -- nohar diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard index 4bc7c3f..974b847 100755 --- a/scripts/live-bottom/19keyboard +++ b/scripts/live-bottom/19keyboard @@ -71,6 +71,8 @@ if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then live-preseed /root console-setup/variantcode '' false live-preseed /root console-setup/modelcode '' false fi + + sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash else chroot /root /usr/sbin/install-keymap $kbd live-preseed /root debian-installer/keymap "$kbd" diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init index 1152b4b..d007556 100755 --- a/scripts/live-bottom/25configure_init +++ b/scripts/live-bottom/25configure_init @@ -66,8 +66,23 @@ if [ -n "$USERNAME" ]; then for f in /root/etc/event.d/tty*; do sed -i -e "s|^respawn.*|respawn /bin/login -f $USERNAME </dev/$(basename $f) > /dev/$(basename $f) 2>\&1|" $f done + + if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then + for x in $(cat /proc/cmdline); do + case $x in + noninteractive) + sed -i -e "s|^exec.*|exec /usr/bin/ubiquity noninteractive </dev/tty1 > /dev/tty1 2>\&1|" /root/etc/event.d/tty1 + rm -f /root/etc/rc?.d/[SK]??gdm + rm -f /root/etc/rc?.d/[SK]??kdm + ;; + esac + done + fi fi fi + + # Since we use autologin, lastlog doesn't make sense on the console. + sed -i '/^[^#].*pam_lastlog\.so/s/^/# /' /root/etc/pam.d/login fi fi diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility index cbff18c..8701e87 100755 --- a/scripts/live-bottom/30accessibility +++ b/scripts/live-bottom/30accessibility @@ -68,13 +68,25 @@ case ${ACCESS} in if [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ]; then sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py fi + gct -s -t bool /apps/gksu/disable-grab true 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 + # Disabled for now, until we know eSpeak works. + #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/gksu/disable-grab true + ;; + # Braille + braille=ask) + gct -s -t bool /desktop/gnome/interface/accessibility true + gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca] + if [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ]; then + sed -i '/^enableSpeech\W/ s/True/False/;/^enableBraille/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py + fi + gct -s -t bool /apps/gksu/disable-grab true ;; # Minor Motor Difficulties access=m1) @@ -86,7 +98,7 @@ case ${ACCESS} in 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 - + gct -s -t bool /apps/gksu/disable-grab true kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/ if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then sed -i 's/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml diff --git a/scripts/live-premount/10driver_updates b/scripts/live-premount/10driver_updates index 7f5c4c4..546d3ca 100755 --- a/scripts/live-premount/10driver_updates +++ b/scripts/live-premount/10driver_updates @@ -38,7 +38,7 @@ is_updates_path() { is_nice_device() { sysfs_path="${1#/sys}" - if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-[ide|scsi|usb])"; then + if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-(ide|scsi|usb))"; then return 0 fi return 1 |