Resync with Debian 1.156.1-1
authorMichael Prokop <mika@grml.org>
Fri, 20 Feb 2009 16:17:00 +0000 (17:17 +0100)
committerMichael Prokop <mika@grml.org>
Fri, 20 Feb 2009 16:17:00 +0000 (17:17 +0100)
bin/live-snapshot
debian/changelog
docs/ChangeLog.casper
docs/parameters.txt
hooks/live
manpages/live-snapshot.en.1.txt
scripts/live
scripts/live-bottom/30accessibility
scripts/live-helpers

index 3d4efad..d942c90 100755 (executable)
@@ -99,7 +99,7 @@ Help ()
        echo "  -o, --output: output image file (default: ${DEST})."
        echo "  -r, --resync-string: internally used to resync previous made snapshots."
        echo "  -f, --refresh: try to sync a running snapshot."
-       echo "  -t, --type: snapshot filesystem type. Options: \"squashfs\", \"ext2\", \"ext3\", \"jffs2\" or \"cpio\".gz archive (default: ${SNAP_TYPE})"
+       echo "  -t, --type: snapshot filesystem type. Options: \"squashfs\", \"ext2\", \"ext3\", \"ext4\", \"jffs2\" or \"cpio\".gz archive (default: ${SNAP_TYPE})"
        echo
        echo "Look at live-snapshot(1) man page for more information."
 
@@ -257,6 +257,11 @@ Defaults ()
                        ""|*.ext2|*.ext3)
                                SNAP_TYPE="ext2"
                                ;;
+
+                       *.ext4)
+                               SNAP_TYPE="ext4"
+                               ;;
+
                        *)
                                Error "unrecognized resync string"
                                ;;
@@ -276,6 +281,10 @@ Defaults ()
                        ext3)
                                DEST="${MOUNTP}/live-sn.ext2"
                                ;;
+
+                       ext4)
+                               DEST="${MOUNTP}/live-sn.ext4"
+                               ;;
                esac
        else
                DEST="${SNAP_OUTPUT}"
@@ -285,7 +294,7 @@ Defaults ()
 Validate_input ()
 {
        case "${SNAP_TYPE}" in
-               cpio|squashfs|jffs2|ext2|ext3)
+               cpio|squashfs|jffs2|ext2|ext3|ext4)
                        ;;
 
                *)
@@ -427,9 +436,9 @@ Do_snapshot ()
                        cd "${OLDPWD}"
                        ;;
 
-               # ext2|ext3 and jffs2 does not easily support an exclude list; files
+               # ext2|ext3|ext4 and jffs2 does not easily support an exclude list; files
                # should be copied to another directory in order to filter content
-               ext2|ext3)
+               ext2|ext3|ext4)
                        DU_DIM="$(du -ks ${SNAP_COW} | cut -f1)"
                        REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 20)" # Just 5% more to be sure, need something more sophistcated here...
                        genext2fs --size-in-blocks=${REAL_DIM} --reserved-percentage=0 --root="${SNAP_COW}" "${DEST}"
@@ -462,7 +471,7 @@ Warn_user ()
        if [ -z "${SNAP_RESYNC_STRING}" ]
        then
                case ${SNAP_TYPE} in
-                       cpio|ext2|ext3)
+                       cpio|ext2|ext3|ext4)
                                echo "Please move ${DEST} (if is not already in it)" > /dev/null 1>&2
                                echo "in a supported writable partition (e.g ext3, vfat)." > /dev/null 1>&2
                                ;;
index 8e494f3..386a55a 100644 (file)
@@ -1,7 +1,7 @@
-live-initramfs (1.154.8-1grml.01) unstable; urgency=low
+live-initramfs (1.156.1-1grml.01) unstable; urgency=low
 
   * Disable 04_fix_no_medium_found_error.dpatch (fixed upstream).
-  * Sync with Debian 1.154.8-1 (mentioning just the relevant changes):
+  * Sync with Debian 1.156.1-1 (mentioning just the relevant changes):
     [ Daniel Baumann ]
     * Adding note about URL limitations in live-initramfs manpage when
       using fetch parameter.
@@ -17,8 +17,11 @@ live-initramfs (1.154.8-1grml.01) unstable; urgency=low
       <synrg@debian.org>.
     * Don't redirect output of fstype detection to standard out, thanks to Ronny
       Standtke <Ronny.Standtke@gmx.net>.
+    * Adding ext4 support.
+    * Merging casper 1.156.
+    * Updating parameters.txt.
 
- -- Michael Prokop <mika@grml.org>  Thu, 05 Feb 2009 10:34:14 +0100
+ -- Michael Prokop <mika@grml.org>  Fri, 20 Feb 2009 17:13:56 +0100
 
 live-initramfs (1.154.4-1grml.02) unstable; urgency=low
 
index d366027..079bcd5 100644 (file)
@@ -1,3 +1,28 @@
+casper (1.156) jaunty; urgency=low
+
+  * scripts/casper-bottom/30accessibility &
+    ubiquity-hooks/30accessibility:
+    - If using a laptop, enable the laptop keyboard layout
+    - There is no longer a need to set gconf values as root in only-ubiquity
+      mode
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Fri, 06 Feb 2009 08:59:52 +0100
+
+casper (1.155) jaunty; urgency=low
+
+  [ Colin Watson ]
+  * Add myself to debian/copyright as an author, as I've done fairly
+    significant work on this.
+  * Eliminate casper-md5check's libm linkage; patch from "SurJector" who
+    points out that the automatic conversion is sufficient (LP: #293613).
+  * Restore showmounts/show-cow option (thanks, Carlo de Wolf and "probono";
+    LP: #159006, #290330).
+
+  [ Evan Dandrea ]
+  * Add support for ext4.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 30 Jan 2009 12:14:00 +0000
+
 casper (1.154) jaunty; urgency=low
 
   [ Evan Dandrea ]
index 921e0c4..60ad650 100644 (file)
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.113.1-1 on 2007-11-26.
+Updated for live-initramfs 1.156.1-1 on 2009-02-08.
 
 These options (can be combined) work from the bootloader prompt:
 
index f2984f4..32adfb6 100755 (executable)
@@ -80,8 +80,9 @@ then
         manual_add_modules cifs
 fi
 
-# Filesystem: ext3
+# Filesystem: ext3/ext4
 manual_add_modules ext3
+manual_add_modules ext4
 
 # Filesystem: jffs2
 manual_add_modules jffs2
index e2c6241..4ead532 100644 (file)
@@ -63,7 +63,7 @@ power-off.
 
   -t, --type **TYPE**::
 
-Type could be one of "cpio", "squashfs", "ext2", "ext3" or "jffs2".
+Type could be one of "cpio", "squashfs", "ext2", "ext3", "ext4", or "jffs2".
 
   -h, --help::
 
index bf90781..df104ef 100755 (executable)
@@ -502,7 +502,7 @@ is_live_path ()
 
        if [ -d "${DIRECTORY}"/"${LIVE_MEDIA_PATH}" ]
        then
-               for FILESYSTEM in squashfs ext2 ext3 xfs dir jffs2
+               for FILESYSTEM in squashfs ext2 ext3 ext4 xfs dir jffs2
                do
                        if [ "$(echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM})" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ]
                        then
@@ -542,7 +542,7 @@ matches_uuid ()
 get_backing_device ()
 {
        case "${1}" in
-               *.squashfs|*.ext2|*.ext3|*.jffs2)
+               *.squashfs|*.ext2|*.ext3|*.ext4|*.jffs2)
                        echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}" "${2}")
                        ;;
 
@@ -579,6 +579,7 @@ mount_images_in_directory ()
        if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
                match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext2" ||
                match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext3" ||
+               match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext4" ||
                match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.jffs2" ||
                match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir"
        then
@@ -919,7 +920,7 @@ find_snap ()
        if [ "${PERSISTENT}" != "nofiles" ]
        then
                # search for image files
-               snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.jffs2")
+               snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snal_label}.ext4 ${snap_label}.jffs2")
        fi
 
        if [ -z "${snapdata}" ]
@@ -951,9 +952,9 @@ try_snap ()
                        break
                fi
 
-               if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|jffs2\)'
+               if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|ext4\|jffs2\)'
                then
-                       # squashfs, jffs2 or ext2/ext3 snapshot
+                       # squashfs, jffs2 or ext2/ext3/ext4 snapshot
                        dev=$(get_backing_device "${snapback}/${snapfile}")
 
                        do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
@@ -1058,7 +1059,7 @@ setup_unionfs ()
                done
        else
                # ${MODULE}.module does not exist, create a list of images
-               for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir
+               for FILESYSTEM in squashfs ext2 ext3 ext4 xfs jffs2 dir
                do
                        for IMAGE in "${image_directory}"/*."${FILESYSTEM}"
                        do
@@ -1071,7 +1072,7 @@ setup_unionfs ()
 
                if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ]
                then
-                       for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir
+                       for FILESYSTEM in squashfs ext2 ext3 ext4 xfs jffs2 dir
                        do
                                for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}"
                                do
@@ -1195,7 +1196,7 @@ setup_unionfs ()
                root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}")
                # This second type should be removed when snapshot will get smarter,
                # hence when "/etc/live-snapshot*list" will be supported also by
-               # ext2|ext3|jffs2 snapshot types.
+               # ext2|ext3|ext4|jffs2 snapshot types.
                home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}")
 
                if [ -b "${cowprobe}" ]
@@ -1427,6 +1428,7 @@ find_livefs ()
                elif [ "${fstype}" = "squashfs" -o \
                        "${fstype}" = "ext2" -o \
                        "${fstype}" = "ext3" -o \
+                       "${fstype}" = "ext4" -o \
                        "${fstype}" = "jffs2" ]
                then
                        # This is an ugly hack situation, the block device has
index 3f88e2f..51780d2 100755 (executable)
@@ -47,6 +47,15 @@ gct ()
        fi
 }
 
+laptop_detect ()
+{
+       if chroot /root /usr/sbin/laptop-detect
+       then
+               echo "orca.settings.orcaModifierKeys = orca.settings.LAPTOP_MODIFIER_KEYS" >> /root/home/$USERNAME/.orca/user-settings.py
+               echo "orca.settings.keyboardLayout = orca.settings.GENERAL_KEYBOARD_LAYOUT_LAPTOP" >> /root/home/$USERNAME/.orca/user-settings.py
+       fi
+}
+
 case ${ACCESS} in
        access=v1)
                # Lesser Visual Impairment
@@ -78,6 +87,7 @@ case ${ACCESS} in
                        echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/user-settings.py
+                       laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
                fi
                ;;
@@ -108,6 +118,7 @@ case ${ACCESS} in
                        echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/user-settings.py
+                       laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
                fi
                ;;
index 8970834..70897d6 100644 (file)
@@ -332,7 +332,7 @@ find_cow_device ()
                        fi
 
                        case "$(get_fstype ${devname})" in
-                               vfat|ext2|ext3|jffs2)
+                               vfat|ext2|ext3|ext4|jffs2)
                                        mkdir -p "${cow_backing}"
                                        if ! try_mount "${devname}" "${cow_backing}" "rw"
                                        then