Adding upstream version 1.110.1.

diff --git a/Makefile b/Makefile
index 459605d..8fdc89d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -108,10 +108,10 @@ uninstall:
 update:
        set -e; for FILE in docs/parameters.txt; \
        do \
-               sed -i  -e 's/2007\\-10\\-01/2007\\-10\\-08/' \
-                       -e 's/2007-10-01/2007-10-08/' \
-                       -e 's/01.10.2007/08.10.2007/' \
-                       -e 's/1.107.1/1.107.2/' \
+               sed -i  -e 's/2007\\-10\\-08/2007\\-10\\-15/' \
+                       -e 's/2007-10-08/2007-10-15/' \
+                       -e 's/09.10.2007/15.10.2007/' \
+                       -e 's/1.110.1/1.110.2/' \
                $$FILE; \
        done
 

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index b1f55c9..f4954ba 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,31 @@
+casper (1.110) gutsy; urgency=low
+
+  * Don't generate fglrx or the nvidia modules in the live session at boot;
+    we disable restricted-manager in the live session anyway so they aren't
+    straightforward to use (see #43706). Saves about 19 MB of memory.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 05 Oct 2007 21:28:29 +0100
+
+casper (1.109) gutsy; urgency=low
+
+  * Cache the stty binary before ejecting the CD.
+  * Skip the CD eject prompt if 'noprompt' is on the kernel command line
+    (LP: #149159).
+  * Try each of (e.g.) 2.6.22-13-generic, 2.6.22-13, and 2.6.22 in turn as
+    directory names for driver updates (LP: #122430).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 05 Oct 2007 03:24:43 +0100
+
+casper (1.108) gutsy; urgency=low
+
+  * If CASPER_GENERATE_UUID is set, generate a random UUID in the initramfs,
+    and check it against the discovered medium (unless booting with the
+    ignore_uuid parameter). This allows live CD images to be safely copied
+    to the hard disk without causing problems when booting future live CDs
+    (LP: #144800).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 04 Oct 2007 14:23:37 +0100
+
 casper (1.107) gutsy; urgency=low
 
   * Fix gconf keys for suspend and hibernate (thanks, Oliver Grawert;

diff --git a/docs/parameters.txt b/docs/parameters.txt
index bbf1157..4b93821 100644 (file)
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.107.1-1 on 2007-10-01.
+Updated for live-initramfs 1.110.1-1 on 2007-10-08.
 
 These options (can be combined) work from the bootloader prompt:
 

diff --git a/hooks/live b/hooks/live
index a59fe3b..8cfc360 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -57,6 +57,13 @@ then
        cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
 fi
 
+# Configuration: Unique ID
+if [ -n "${LIVE_GENERATE_UUID}" ]
+then
+       mkdir -p "${DESTDIR}"/conf
+       uuidgen -r > "${DESTDIR}"/conf/uuid.conf
+fi
+
 # Filesystem: cifs
 if [ -x /sbin/mount.cifs ]
 then

diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index c197abb..0b1a4bf 100644 (file)
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -60,6 +60,12 @@ copying to ram and booting it.
 
 Those parameters lets you override values read from the config file.
 
+  ignore_uuid
+
+Do not check that any UUID embedded in the initramfs matches the discovered
+medium. live-initramfs may be told to generate a UUID by setting
+LIVE_GENERATE_UUID=1 when building the initramfs.
+
   integrity-check::
 
 If specified, an MD5 sum is calculated on the live media during boot and
@@ -169,6 +175,10 @@ be checked at boot time, use this parameter, otherwise they are skipped.
 disables the "persistent" feature, useful if the bootloader (like syslinux) has
 been installed with persistent enabled.
 
+  noprompt
+
+Do not prompt to eject the CD on reboot.
+
   nosudo::
 
 This parameter disables the automatic configuration of sudo.

diff --git a/scripts/live b/scripts/live
index b1157c5..7e748dc 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -79,6 +79,11 @@ Arguments ()
                                export USERFULLNAME LIVECONF
                                ;;
 
+                       ignore_uuid)
+                               IGNORE_UUID="Yes"
+                               export IGNORE_UUID
+                               ;;
+
                        ip=*)
                                STATICIP="${ARGUMENT#ip=}"
 
@@ -434,6 +439,31 @@ is_live_path ()
        return 1
 }
 
+matches_uuid ()
+{
+       if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
+       then
+               return 0
+       fi
+
+       path="${1}"
+       uuid="$(cat /conf/uuid.conf)"
+
+       for try_uuid_file in "${mountpoint}/.disk/casper-uuid"*
+       do
+               [ -e "${try_uuid_file}" ] || continue
+
+               try_uuid="$(cat "${try_uuid_file}")"
+
+               if [ "${uuid}" = "${try_uuid}" ]
+               then
+                       return 0
+               fi
+       done
+
+       return 1
+}
+
 get_backing_device ()
 {
        case "${1}" in
@@ -732,7 +762,7 @@ do_snap_copy ()
                if [ -n "${fstype}" ]
                then
                        # Copying stuff...
-                       mount -t "${fstype}" -o ro,noatime "${fromdev}" "${tomount}"
+                       mount -t "${fstype}" -o ro,noatime,nodiratime "${fromdev}" "${tomount}"
                        cp -a "${tomount}"/* ${todir}
                        umount "${tomount}"
                else
@@ -908,7 +938,7 @@ setup_unionfs ()
 
                        mkdir -p "${croot}/${imagename}"
                        echo "debug: Can not mount backdev ${backdev} (image = ${image}) on croot/imagename ${croot}/${imagename}"
-                       mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
+                       mount -t "${fstype}" -o ro,noatime,nodiratime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
                fi
        done
 
@@ -932,9 +962,9 @@ setup_unionfs ()
                fi
        fi
 
-       mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || panic "Can not mount ${cowdevice} on /cow"
+       mount ${cowdevice} -t ${cow_fstype} -o rw,noatime,nodiratime /cow || panic "Can not mount ${cowdevice} on /cow"
 
-       mount -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "${UNIONTYPE} mount failed"
+       mount -t ${UNIONTYPE} -o noatime,nodiratime,dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "${UNIONTYPE} mount failed"
 
        # Adding other custom mounts
        if [ -n "${PERSISTENT}" ]
@@ -945,7 +975,7 @@ setup_unionfs ()
 
                if [ -b "${homecow}" ]
                then
-                       mount -t $(get_fstype "${homecow}") -o rw,noatime "${homecow}" "${rootmnt}/home"
+                       mount -t $(get_fstype "${homecow}") -o rw,noatime,nodiratime "${homecow}" "${rootmnt}/home"
                        export HOMEMOUNTED=1 # used to proper calculate free space in do_snap_copy()
                else
                        [ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent home medium"
@@ -983,6 +1013,7 @@ check_dev ()
 {
        sysdev="${1}"
        devname="${2}"
+       skip_uuid_check="${3}"
 
        if [ -z "${devname}" ]
        then
@@ -999,9 +1030,10 @@ check_dev ()
 
        if is_supported_fs ${fstype}
        then
-               mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
+               mount -t ${fstype} -o ro,noatime,nodiratime "${devname}" ${mountpoint} || continue
 
-               if is_live_path ${mountpoint}
+               if is_live_path ${mountpoint} && \
+                       ([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
                then
                        echo ${mountpoint}
                        return 0
@@ -1025,7 +1057,7 @@ find_livefs ()
        # first look at the one specified in the command line
        if [ ! -z "${LIVE_MEDIA}" ]
        then
-               if check_dev "null" "${LIVE_MEDIA}"
+               if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check"
                then
                        return 0
                fi

diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
index 2a6f1ca..16a78f3 100755 (executable)
--- a/scripts/live-bottom/38disable_restricted_manager
+++ b/scripts/live-bottom/38disable_restricted_manager
@@ -27,4 +27,10 @@ log_begin_msg "Disabling restricted-manager..."
 rm -f /root/etc/xdg/autostart/restricted-manager.desktop
 rm -f /root/etc/xdg/autostart/restricted-manager-kde.desktop
 
+# Since we disable restricted-manager, there isn't much point generating the
+# fglrx or nvidia modules either. The other restricted modules may still be
+# useful.
+sed -i 's/^DISABLED_MODULES=""/DISABLED_MODULES="fglrx nv"/' \
+       /root/etc/default/linux-restricted-modules-common
+
 log_end_msg

diff --git a/scripts/live-premount/10driver_updates b/scripts/live-premount/10driver_updates
index 22d64d2..eda8bbf 100755 (executable)
--- a/scripts/live-premount/10driver_updates
+++ b/scripts/live-premount/10driver_updates
@@ -41,20 +41,25 @@ is_updates_path ()
        # kernel flavour.
 
        path=${1}
-       kbase=$(uname -r | sed 's/^\([0-9]*\.[0-9]*\.[0-9]*\)-.*/\1/')
-       update_dir="${path}/ubuntu-drivers/${kbase}"
+       abi="$(uname -r)"
+       kver="$(echo "$abi" | cut -d- -f1,2)"
+       kbase="$(echo "$abi" | cut -d- -f1)"
+
+       for leaf in "$abi" "$kver" "$kbase"
+       do
+               update_dir="$path/ubuntu-drivers/$leaf"
+
+               [ -d "$update_dir" ] || continue
 
-       if [ -d "${update_dir}" ]
-       then
                if [ "$(echo ${update_dir}/*_${DPKG_ARCH}.deb)" != \
                        "${update_dir}/*_${DPKG_ARCH}.deb" ]
                then
                        echo "${update_dir}"
-                       return 0;
+                       return 0
                fi
-       fi
+       done
 
-       return 1;
+       return 1
 }
 
 is_nice_device ()