From: Daniel Baumann Date: Sun, 18 Apr 2010 18:41:47 +0000 (+0200) Subject: Adding upstream version 1.118.1. X-Git-Tag: upstream/1.118.1^0 X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=c303d09e10ef3774540af4b91d0f25bf8f3c1981;p=live-boot-grml.git Adding upstream version 1.118.1. --- diff --git a/Makefile b/Makefile index 58fa660..dd0a6b9 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ update: sed -i -e 's/2007\\-11\\-19/2007\\-11\\-26/' \ -e 's/2007-11-19/2007-11-26/' \ -e 's/19.11.2007/26.11.2007/' \ - -e 's/1.110.7/1.110.8/' \ + -e 's/1.113.1/1.113.2/' \ $$FILE; \ done diff --git a/bin/live-snapshot b/bin/live-snapshot index 3d0183d..ffa4670 100755 --- a/bin/live-snapshot +++ b/bin/live-snapshot @@ -100,7 +100,7 @@ Help () echo " -d, --device: specifies the output snapshot device (default: none)." echo " -o, --output: specifies the output image file (default: ${type} dependent)." echo " -r, --resync-string: internally used to resync previous made snapshots." - echo " -t, --type: specifies the snapshot type between \"squashfs\", \"ext2\", \"ext3\" or \"cpio\".gz archive (default: cpio)" + echo " -t, --type: specifies the snapshot type between \"squashfs\", \"ext2\", \"ext3\", \"jffs2\" or \"cpio\".gz archive (default: cpio)" /bin/echo -e "\nLook at live-snapshot(1) man page for more information." exit 0 @@ -154,6 +154,10 @@ Do_snapshot () genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root="${COW}" "${DEST}" || exit 1 ;; + jffs2) + mkfs.jffs2 --root="${COW}" --output="${DEST}" || exit 1 + ;; + *) echo "Internal error." exit 1 @@ -290,6 +294,10 @@ Defaults () TYPE="squashfs" ;; + *.jffs2) + TYPE="jffs2" + ;; + ""|*.ext2|*.ext3) TYPE="ext2" ;; @@ -310,7 +318,7 @@ Defaults () fi case "${SNAP_TYPE}" in - "cpio"|"squashfs"|"ext2"|"ext3") + "cpio"|"squashfs"|"ext2"|"ext3"|"jffs2") TYPE="${SNAP_TYPE}" ;; diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index f4954ba..88245c9 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,79 @@ +casper (1.118) hardy; urgency=low + + [ Julian Andres Klode, Colin Watson ] + * Use aufs instead of unionfs if union=aufs is given (LP: #187259). + + -- Colin Watson Thu, 14 Feb 2008 18:00:36 +0000 + +casper (1.117) hardy; urgency=low + + * Disable speech for magnifier and braille profiles again. Thanks + Luke Yelavich. + * esd is enabled by default, so the comment in 30accessibility is no + longer relevant. + + -- Evan Dandrea Wed, 13 Feb 2008 01:20:22 -0500 + +casper (1.116) hardy; urgency=low + + * Fix setting orca options in 30accessibility. + * Remove gdm and kdm from init when using automatic-ubiquity and + only-ubiquity. The ubiquity initscript will take care of spawning + these. + + -- Evan Dandrea Mon, 11 Feb 2008 12:19:39 -0500 + +casper (1.115) hardy; urgency=low + + * Add the user to the groups specified by user-setup-udeb. + + -- Evan Dandrea Thu, 24 Jan 2008 19:08:33 +0000 + +casper (1.114) hardy; urgency=low + + [ Colin Watson ] + * casper-md5check: Close md5_file before exiting. + * Disable tracker-applet as well as trackerd, otherwise the former starts + the latter. + * casper-snapshot: Fix argument parsing (thanks, Tormod Volden; + LP: #179411). + + -- Colin Watson Tue, 15 Jan 2008 18:25:21 +0000 + +casper (1.113) hardy; urgency=low + + [ Tollef Fog Heen ] + * dpkg-divert away update-initramfs as it's useless on live CDs and + annoying when people install LVM and similar tools in order to rescue + a system. LP: #150188 + + [ Colin Watson ] + * Adjust /etc/sudoers editing code so that it doesn't repeatedly add + "NOPASSWD:" in persistent mode (LP: #175159). + * Avoid ejecting the CD if booting from an ISO image rather than from a + physical CD (thanks, Agostino Russo; LP: #176014). + + -- Colin Watson Wed, 19 Dec 2007 09:17:50 +0000 + +casper (1.112) hardy; urgency=low + + * hooks/casper: no need to copy udevinfo into the initramfs, it's already + there inside udevadm + * scripts/casper: call udevadm with trigger and settle arguments + * scripts/casper-bottom/23networking: call udevadm with trigger and + settle arguments + * scripts/casper-helpers: call udevadm with info and settle arguments + + -- Scott James Remnant Fri, 14 Dec 2007 15:00:29 +0000 + +casper (1.111) hardy; urgency=low + + * Remove code to set the progress bar to throbbing, this now comes as + standard so we don't need to duplicate it or override things that + attempted to set progress. LP: #162397. + + -- Scott James Remnant Tue, 13 Nov 2007 20:49:31 +0000 + casper (1.110) gutsy; urgency=low * Don't generate fglrx or the nvidia modules in the live session at boot; diff --git a/docs/parameters.txt b/docs/parameters.txt index c9c8c91..a9ac3ed 100644 --- a/docs/parameters.txt +++ b/docs/parameters.txt @@ -1,7 +1,7 @@ Boot Parameters for Debian Live ------------------------------- -Updated for live-initramfs 1.110.7-1 on 2007-11-19. +Updated for live-initramfs 1.113.1-1 on 2007-11-26. These options (can be combined) work from the bootloader prompt: diff --git a/hooks/live b/hooks/live index 5d9de44..c18dfc2 100755 --- a/hooks/live +++ b/hooks/live @@ -74,6 +74,9 @@ fi # Filesystem: ext3 manual_add_modules ext3 +# Filesystem: jffs2 +manual_add_modules jffs2 + # Filesystem: squashfs copy_exec /sbin/losetup /sbin manual_add_modules loop diff --git a/manpages/live-snapshot.en.1.txt b/manpages/live-snapshot.en.1.txt index 7cebed5..e880b08 100644 --- a/manpages/live-snapshot.en.1.txt +++ b/manpages/live-snapshot.en.1.txt @@ -57,7 +57,7 @@ internally used on resyncs. -t, --type **TYPE**:: -Type could be one of "cpio", "squashfs" or "ext2". +Type could be one of "cpio", "squashfs", "ext2", "ext3" or "jffs2". -h, --help:: diff --git a/scripts/live b/scripts/live index 80f77e9..332de10 100755 --- a/scripts/live +++ b/scripts/live @@ -436,7 +436,7 @@ is_live_path () if [ -d "${DIRECTORY}"/"${LIVE_MEDIA_PATH}" ] then - for FILESYSTEM in squashfs ext2 ext3 xfs dir + for FILESYSTEM in squashfs ext2 ext3 xfs dir jffs2 do if [ "$(echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM})" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ] then @@ -476,7 +476,7 @@ matches_uuid () get_backing_device () { case "${1}" in - *.squashfs|*.ext2|*.ext3) + *.squashfs|*.ext2|*.ext3|*.jffs2) echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}") ;; @@ -513,6 +513,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}/*.jffs2" || match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir" then [ -n "${mac}" ] && adddirectory="${directory}/${LIVE_MEDIA_PATH}/${mac}" @@ -540,7 +541,7 @@ is_supported_fs () fstype="${1}" case ${fstype} in - vfat|iso9660|udf|ext2|ext3|ntfs) + vfat|iso9660|udf|ext2|ext3|ntfs|jffs2) return 0 ;; esac @@ -804,7 +805,7 @@ try_snap () snap_label="${1}" snap_mount="${2}" snap_type="${3}" - snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3") + snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.jffs2") if [ ! -z "${snapdata}" ] then @@ -812,9 +813,9 @@ try_snap () snapback="$(echo ${snapdata} | cut -f2 -d ' ')" snapfile="$(echo ${snapdata} | cut -f3 -d ' ')" - if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\)' + if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|jffs2\)' then - # squashfs or ext2/ext3 snapshot + # squashfs, jffs2 or ext2/ext3 snapshot dev=$(get_backing_device "${snapback}/${snapfile}") if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" @@ -891,6 +892,9 @@ setup_unionfs () then # go aroung a bug in nfs-unionfs locking for unionfs <= 1.4 roopt="nfsro" + elif [ "${UNIONTYPE}" = "aufs" ] + then + roopt="rr" else roopt="ro" fi @@ -910,7 +914,7 @@ setup_unionfs () done else # ${MODULE}.module does not exist, create a list of images - for FILESYSTEM in squashfs ext2 ext3 xfs dir + for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir do for IMAGE in "${image_directory}"/*."${FILESYSTEM}" do @@ -923,7 +927,7 @@ setup_unionfs () if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ] then - for FILESYSTEM in squashfs ext2 ext3 xfs dir + for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir do for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}" do @@ -1184,7 +1188,8 @@ find_livefs () done elif [ "${fstype}" = "squashfs" -o \ "${fstype}" = "ext2" -o \ - "${fstype}" = "ext3" ] + "${fstype}" = "ext3" -o \ + "${fstype}" = "jffs2" ] then # This is an ugly hack situation, the block device has # an image directly on it. It's hopefully @@ -1198,14 +1203,6 @@ find_livefs () return 1 } -pulsate () -{ - if [ -x /sbin/usplash_write ] - then - /sbin/usplash_write "PULSATE" - fi -} - set_usplash_timeout () { if [ -x /sbin/usplash_write ] @@ -1225,7 +1222,6 @@ mountroot () set_usplash_timeout [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-premount" - pulsate run_scripts /scripts/live-premount [ "${quiet}" != "y" ] && log_end_msg @@ -1291,7 +1287,6 @@ mountroot () maybe_break live-bottom [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-bottom" - pulsate run_scripts /scripts/live-bottom [ "${quiet}" != "y" ] && log_end_msg diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser index e5067dd..1a80e26 100755 --- a/scripts/live-bottom/10adduser +++ b/scripts/live-bottom/10adduser @@ -59,7 +59,7 @@ EOF if [ -z "${NOSUDO}" ] then - if [ -f /root/etc/sudoers ] + if ! grep -q "${USERNAME}" /root/etc/sudoers then echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers diff --git a/scripts/live-bottom/18hostname b/scripts/live-bottom/18hostname index 1dbb897..446bc23 100755 --- a/scripts/live-bottom/18hostname +++ b/scripts/live-bottom/18hostname @@ -46,4 +46,6 @@ ff02::2 ip6-allrouters ff02::3 ip6-allhosts EOF +hostname "${HOSTNAME}" + log_end_msg diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility index 9c20265..eaf3a50 100755 --- a/scripts/live-bottom/30accessibility +++ b/scripts/live-bottom/30accessibility @@ -64,9 +64,11 @@ case ${ACCESS} in gct -s -t bool /desktop/gnome/applications/at/visual/startup true gct -s -t bool /apps/gksu/disable-grab true - if [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ] + if type orca > /dev/null 2>&1 then - sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py + mkdir -p /root/home/${USERNAME}/.orca + echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/orca-customizations.py + echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py fi ;; @@ -85,9 +87,11 @@ case ${ACCESS} in gct -s -t bool /desktop/gnome/applications/at/visual/startup true gct -s -t bool /apps/gksu/disable-grab true - if [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ] + if type orca > /dev/null 2>&1 then - sed -i '/^enableSpeech\W/ s/True/False/;/^enableBraille/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py + mkdir -p /root/home/${USERNAME}/.orca + echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/orca-customizations.py + echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py fi ;; diff --git a/scripts/live-bottom/36disable_trackerd b/scripts/live-bottom/36disable_trackerd index 24a43d8..62ad1df 100755 --- a/scripts/live-bottom/36disable_trackerd +++ b/scripts/live-bottom/36disable_trackerd @@ -31,7 +31,8 @@ log_begin_msg "Disabling trackerd..." # live-initramfs script -rm -f /root/etc/xdg/autostart/trackerd.desktop \ - /root/usr/share/autostart/trackerd.desktop +rm -f /root/etc/xdg/autostart/tracker-applet.desktop \ + /root/etc/xdg/autostart/trackerd.desktop \ + /root/usr/share/autostart/trackerd.desktop log_end_msg diff --git a/scripts/live-bottom/43disable_updateinitramfs b/scripts/live-bottom/43disable_updateinitramfs new file mode 100755 index 0000000..a973843 --- /dev/null +++ b/scripts/live-bottom/43disable_updateinitramfs @@ -0,0 +1,41 @@ +#!/bin/sh + +#set -e + +# initramfs-tools header + +PREREQ="" + +prereqs() +{ + echo "${PREREQ}" +} + +case "${1}" in + prereqs) + prereqs + exit 0 + ;; +esac + +# live-initramfs header + +. /scripts/live-functions + +log_begin_msg "Disabling update-initramfs (useless on a live CD)..." + +# live-initramfs script + +chroot /root dpkg-divert --add --rename --quiet \ + /usr/sbin/update-initramfs + +cat > /root/usr/sbin/update-initramfs <