Adding upstream version 1.157.1.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 079bcd5..31d5e92 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,20 @@
+casper (1.157) jaunty; urgency=low
+
+  [ Emmet Hikory ]
+  * 10adduser: add Category=Favorites support for netbook-launcher
+    (LP: #334656)
+
+  [ Luke Yelavich ]
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Remove the fast user switch applet from the top panel, to re-enable
+      the logout/shutdown menu options in the system menu. This is done for
+      the speech and braille accessibility profiles. Requiring several
+      keyboard shortcuts to access something that is not entirely accessible
+      yet only makes things difficult for blind/vision impaired users, and is
+      likely to cause much confusion if sed menu entries are not present.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Tue, 03 Mar 2009 15:49:21 +1100
+

 casper (1.156) jaunty; urgency=low
 
   * scripts/casper-bottom/30accessibility &
 casper (1.156) jaunty; urgency=low
 
   * scripts/casper-bottom/30accessibility &

diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index ecf9db5..c43fa5e 100644 (file)
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -114,6 +114,11 @@ to find this device for the "/live" directory where the read-only root
 filesystem should reside. If it did not find something usable, the normal scan
 for block devices is performed.
 
 filesystem should reside. If it did not find something usable, the normal scan
 for block devices is performed.
 

+Instead of specifing an actual device name, the keyword 'removable' can be used
+to limit the search of acceptable live media to removable type only. Note that
+if you want to further restrict the media to usb mass storage only, you can use
+the 'removable-usb' keyword.
+

   {live-media-encryption|encryption}=**TYPE**::
 
 live-initramfs will mount the encrypted rootfs TYPE, asking the passphrase,
   {live-media-encryption|encryption}=**TYPE**::
 
 live-initramfs will mount the encrypted rootfs TYPE, asking the passphrase,


@@ -245,6 +250,11 @@ This parameter will make live-initramfs to show on "/" the ro filesystems
 lead to problems by applications like "mono" which store binary paths on
 installation.
 
 lead to problems by applications like "mono" which store binary paths on
 installation.
 

+  silent
+
+If you boot with the normal quiet parameter, live-initramfs hides most messages
+of its own. When adding silent, it hides all.
+

   textonly
 
 Start up to text-mode shell prompts, disabling the graphical user interface.
   textonly
 
 Start up to text-mode shell prompts, disabling the graphical user interface.

diff --git a/scripts/live b/scripts/live
index df104ef..ef7f64d 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -391,6 +391,11 @@ Arguments ()
                                export SHOWMOUNTS
                                ;;
 
                                export SHOWMOUNTS
                                ;;
 

+                       silent)
+                               SILENT="Yes"
+                               export SILENT
+                               ;;
+

                        textonly)
                                TEXTONLY="Yes"
                                export TEXTONLY
                        textonly)
                                TEXTONLY="Yes"
                                export TEXTONLY


@@ -1386,15 +1391,6 @@ find_livefs ()
 {
        timeout="${1}"
 
 {
        timeout="${1}"
 

-       # first look at the one specified in the command line
-       if [ ! -z "${LIVE_MEDIA}" ]
-       then
-               if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check"
-               then
-                       return 0
-               fi
-       fi
-

        # don't start autodetection before timeout has expired
        if [ -n "${LIVE_MEDIA_TIMEOUT}" ]
        then
        # don't start autodetection before timeout has expired
        if [ -n "${LIVE_MEDIA_TIMEOUT}" ]
        then


@@ -1404,6 +1400,54 @@ find_livefs ()
                fi
        fi
 
                fi
        fi
 

+       # first look at the one specified in the command line
+       case "${LIVE_MEDIA}" in
+               removable-usb)
+                       for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+                       do
+                               if [ "$(cat ${sysblock}/removable)" = "1" ]
+                               then
+                                       if readlink ${sysblock}/device | grep -q usb
+                                       then
+                                               for dev in $(subdevices "${sysblock}")
+                                               do
+                                                       if check_dev "${dev}"
+                                                       then
+                                                               return 0
+                                                       fi
+                                               done
+                                       fi
+                               fi
+                       done
+                       ;;
+
+               removable)
+                       for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+                       do
+                               if [ "$(cat ${sysblock}/removable)" = "1" ]
+                               then
+                                       for dev in $(subdevices "${sysblock}")
+                                       do
+                                               if check_dev "${dev}"
+                                               then
+                                                       return 0
+                                               fi
+                                       done
+                               fi
+                       done
+                       ;;
+
+               *)
+                       if [ ! -z "${LIVE_MEDIA}" ]
+                       then
+                               if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check"
+                               then
+                                       return 0
+                               fi
+                       fi
+                       ;;
+       esac
+

        # or do the scan of block devices
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
        do
        # or do the scan of block devices
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
        do


@@ -1585,5 +1629,5 @@ mountroot ()
        exec 1>&6 6>&-
        exec 2>&7 7>&-
        kill ${tailpid}
        exec 1>&6 6>&-
        exec 2>&7 7>&-
        kill ${tailpid}

-       cp live.log "${rootmnt}/var/log/"
+       [ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null

 }
 }

diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index aa75369..6348338 100755 (executable)
--- a/scripts/live-bottom/14locales
+++ b/scripts/live-bottom/14locales
@@ -29,6 +29,9 @@ fi
 
 log_begin_msg "Setting up locales"
 
 
 log_begin_msg "Setting up locales"
 

+# Cosmetic line wrapping for output of local-gen
+echo
+

 # live-initramfs script
 
 if [ -e /root/etc/default/locale ]
 # live-initramfs script
 
 if [ -e /root/etc/default/locale ]


@@ -113,7 +116,13 @@ then
        printf 'LANG="%s"\n' "${LANG}" >> /root/etc/default/locale
        printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment
        printf '%s %s\n' "${LANG}" "${codepage}" > /root/etc/locale.gen
        printf 'LANG="%s"\n' "${LANG}" >> /root/etc/default/locale
        printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment
        printf '%s %s\n' "${LANG}" "${codepage}" > /root/etc/locale.gen

-       chroot /root /usr/sbin/locale-gen
+
+       if [ -z "${SILENT}" ]
+       then
+               chroot /root /usr/sbin/locale-gen
+       else
+               chroot /root /usr/sbin/locale-gen > /dev/null 2>&1
+       fi

 fi
 
 log_end_msg
 fi
 
 log_end_msg

diff --git a/scripts/live-bottom/16umountfs b/scripts/live-bottom/16umountfs
new file mode 100755 (executable)
index 0000000..64ad99d
--- /dev/null
+++ b/scripts/live-bottom/16umountfs
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+#set -e
+
+# initramfs-tools header
+
+PREREQ=""
+
+prereqs()
+{
+       echo "${PREREQ}"
+}
+
+case "${1}" in
+       prereqs)
+               prereqs
+               exit 0
+               ;;
+esac
+
+# live-initramfs header
+
+. /live.vars
+
+. /scripts/live-functions
+
+log_begin_msg "Disabling umountfs for live specific filesystems"
+
+# live-initramfs script
+
+if [ -e /root/etc/init.d/umountfs ]
+then
+       sed -i  -e 's#pioodl $TMPFS_MTPTS)#pioodl $TMPFS_MTPTS | sed -e "s@\\ @\\n@" | grep -v ^/live)#' \
+               -e 's#pioodl $REG_MTPTS)#pioodl $REG_MTPTS | sed -e "s@\\ @\\n@" | grep -v ^/live | grep -v ^/filesystem) /#' \
+       /root/etc/init.d/umountfs
+fi
+
+log_end_msg

diff --git a/scripts/live-bottom/19keyboard b/scripts/live-bottom/19keyboard
index 2bf0b1c..d465698 100755 (executable)
--- a/scripts/live-bottom/19keyboard
+++ b/scripts/live-bottom/19keyboard
@@ -93,7 +93,8 @@ then
        live-preseed /root console-setup/codesetcode '' false
 
        sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash
        live-preseed /root console-setup/codesetcode '' false
 
        sed -i 's/CONSOLE_SCREEN=$/CONSOLE_SCREEN=setupcon/; t END; b; : END; n; b END' /root/etc/init.d/usplash

-else
+elif [ -e /root/usr/sbin/install-keymap ]
+then

        chroot /root /usr/sbin/install-keymap ${kbd}
        live-preseed /root debian-installer/keymap "${kbd}"
        live-preseed /root kbd-chooser/method "${kbd}"
        chroot /root /usr/sbin/install-keymap ${kbd}
        live-preseed /root debian-installer/keymap "${kbd}"
        live-preseed /root kbd-chooser/method "${kbd}"

diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver
index 29ae78e..ef17bff 100755 (executable)
--- a/scripts/live-bottom/21xdriver
+++ b/scripts/live-bottom/21xdriver
@@ -20,12 +20,7 @@ esac
 
 # live-initramfs header
 
 
 # live-initramfs header
 

-if [ -n "${NOXAUTOCONFIG}" ]
-then
-       exit 0
-fi
-
-if [ ! -x /root/usr/bin/X ]
+if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -n "${XDRIVER}" ]

 then
        exit 0
 fi
 then
        exit 0
 fi


@@ -38,22 +33,19 @@ log_begin_msg "Configuring X video driver"
 
 . /live.vars
 
 
 . /live.vars
 

-if [ -n "$XDRIVER" ]
-then
-       mount -o bind /sys /root/sys
-       mount -o bind /proc /root/proc
-       mount -o bind /dev /root/dev
+mount -o bind /sys /root/sys
+mount -o bind /proc /root/proc
+mount -o bind /dev /root/dev

 
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
 set xserver-xorg/autodetect_video_card false
 set xserver-xorg/config/device/driver ${XDRIVER}
 EOF
 
 
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
 set xserver-xorg/autodetect_video_card false
 set xserver-xorg/config/device/driver ${XDRIVER}
 EOF
 

-       chroot /root dexconf
+chroot /root dexconf

 
 

-       umount /root/sys
-       umount /root/proc
-       umount /root/dev
-fi
+umount /root/sys
+umount /root/proc
+umount /root/dev

 
 log_end_msg
 
 log_end_msg

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 51780d2..3ff3fda 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -56,6 +56,24 @@ laptop_detect ()
        fi
 }
 
        fi
 }
 

+remove_applet ()
+{
+       # Code to remove an applet from the default panel setup
+       # This is rather hacky, but I can't think of a one or two line regular
+       # expression to do this any more efficiently. Patches welcome. In
+       # addition, setting these via gconf also doesn't work for some reason.
+
+       local line_no prior_line next_line
+
+       line_no="$(grep -n "<string>$1</string>" /root/usr/share/gconf/defaults/05_panel-default-setup.entries | cut -f 1 -d :)"
+       prior_line="$((line_no-1))"
+       next_line="$((line_no+1))"
+
+       sed -i -n "${prior_line},${next_line}!p" /root/usr/share/gconf/defaults/05_panel-default-setup.entries
+
+       chroot /root update-gconf-defaults
+}
+

 case ${ACCESS} in
        access=v1)
                # Lesser Visual Impairment
 case ${ACCESS} in
        access=v1)
                # Lesser Visual Impairment


@@ -102,6 +120,7 @@ case ${ACCESS} in
                gct -s -t bool /apps/gksu/disable-grab true
                gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
                gct -s -t bool /apps/gksu/disable-grab true
                gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 

+               remove_applet fast_user_switch

                ;;
 
        braille=ask)
                ;;
 
        braille=ask)


@@ -121,6 +140,8 @@ case ${ACCESS} in
                        laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
                fi
                        laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
                fi

+
+               remove_applet fast_user_switch

                ;;
 
        access=m1)
                ;;
 
        access=m1)