diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | docs/ChangeLog | 10 | ||||
| -rw-r--r-- | docs/ChangeLog.casper | 49 | ||||
| -rw-r--r-- | docs/parameters.txt | 3 | ||||
| -rw-r--r-- | manpages/live-initramfs.en.7 | 2 | ||||
| -rw-r--r-- | manpages/live-snapshot.en.1 | 2 | ||||
| -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 |
14 files changed, 127 insertions, 13 deletions
@@ -108,9 +108,9 @@ uninstall: update: set -e; for FILE in docs/parameters.txt manpages/*.en.*; \ do \ - sed -i -e 's/2007\\-07\\-23/2007\\-07\\-30/' \ - -e 's/23.07.2007/30.07.2007/' \ - -e 's/1.91.6/1.91.7/' \ + sed -i -e 's/2007\\-07\\-30/2007\\-08\\-06/' \ + -e 's/30.07.2007/06.08.2007/' \ + -e 's/1.95.1/1.95.2/' \ $$FILE; \ done diff --git a/debian/changelog b/debian/changelog index 6ca89ff..b8b172e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-initramfs (1.95.1-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Baumann <daniel@debian.org> Mon, 30 Jul 2007 00:00:00 +0200 + live-initramfs (1.91.6-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index bb6fef5..d122176 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: live-initramfs Section: misc Priority: optional -Maintainer: Debian Live <debian-live-devel@lists.alioth.debian.org> -Uploaders: Daniel Baumann <daniel@debian.org>, Marco Amadori <marco.amadori@gmail.com> +Maintainer: Debian Live <debian-live-maint@lists.alioth.debian.org> +Uploaders: Daniel Baumann <daniel@debian.org> Build-Depends: debhelper (>= 5), lsb-release Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/debian-live/dists/trunk/live-initramfs/ @@ -13,8 +13,6 @@ Architecture: all Depends: ${misc:Depends}, file, initramfs-tools, sudo, user-setup Recommends: eject, live-initscripts Suggests: genext2fs, squashfs-tools -Conflicts: casper -Replaces: casper Description: Debian Live initramfs hook live-initramfs is a hook for the initramfs-tools, used to generate a initramfs capable to boot live systems, such as those created by live-helper. This diff --git a/docs/ChangeLog b/docs/ChangeLog index 55401ac..d30ef8b 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,12 @@ +2007-07-29 Daniel Baumann <daniel@debian.org> + + * Merging changes from casper 1.95. + * Uploaded 1.95.1-1. + +2007-07-26 Daniel Baumann <daniel@debian.org> + + * Merging changes from casper 1.92, 1.93 and 1.94. + 2007-07-26 Daniel Baumann <daniel@debian.org> * bin/live-md5check: @@ -8,6 +17,7 @@ - Fixed typo. - Added live-media-path as suggested by Jordi Pujol <jordi_pujol@telefonica.net>. + * Uploaded 1.91.6-1. 2007-07-19 Daniel Baumann <daniel@debian.org> diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index e125fa4..2dcc059 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,52 @@ +casper (1.95) gutsy; urgency=low + + * Fix regex syntax error while looking for non-CD devices for driver + updates. + * Fix ip= boot parameter, documented but not properly merged from Debian. + + -- Colin Watson <cjwatson@ubuntu.com> Fri, 27 Jul 2007 15:03:41 +0100 + +casper (1.94) gutsy; urgency=low + + [ Colin Watson ] + * Hack around keyboard configuration not being done until after the keymap + is set by having /etc/init.d/usplash reconfigure the console + (LP: #68487). + * Disable pam_lastlog on the console if doing autologin (LP: #126800). + + [ Luke Yelavich ] + * scripts/casper-bottom/30accessibility & + ubiquity-hooks/30accessibility: + - Prevent gksu from grabbing keyboard focus for the v2, v3, and m1 + accessibility profiles. (LP: #67172) + * Start Orca when a Braille device is configured from choosing the + Braille option in the Accessibility menu. (Partially fixes Launchpad + bug #122024) + * Re-enable desktop sounds for the blindness accessibility profile, as + eSpeak should be able to speak alongside audio playback. + + -- Colin Watson <cjwatson@ubuntu.com> Tue, 24 Jul 2007 16:24:55 +0100 + +casper (1.93) gutsy; urgency=low + + * revert gdm-cdd.conf handling for autologin to the chrooted code + as we had it in feisty. not chrooting brings up problems with the + alternatives system (dead symlinks) used for gdm-cdd.conf + + -- Oliver Grawert <ogra@ubuntu.com> Wed, 18 Jul 2007 15:08:16 +0200 + +casper (1.92) gutsy; urgency=low + + [ Colin Watson ] + * Don't bother chrooting just to run test(1). + + [ Evan Dandrea ] + * Added support for URL-based preseeding. + * Added 'noninteractive' option that starts ubiquity in noninteractive + mode on tty1. + + -- Colin Watson <cjwatson@ubuntu.com> Mon, 09 Jul 2007 15:23:51 +0100 + casper (1.91) gutsy; urgency=low * Fix Maintainer field (ubuntu-devel-discuss, not ubuntu-devel). diff --git a/docs/parameters.txt b/docs/parameters.txt index cde3d94..ab6a487 100644 --- a/docs/parameters.txt +++ b/docs/parameters.txt @@ -1,7 +1,7 @@ Boot Parameters for Debian Live ------------------------------- -Updated for live-initramfs 1.91.6-1 on 2007-07-23. +Updated for live-initramfs 1.95.1-1 on 2007-07-30. These options (can be combined) work from the syslinux bootprompt: @@ -23,6 +23,7 @@ live live-getty live {live-media|bootfrom}=DEVICE live {live-media-encryption|encryption}=TYPE live live-media-offset=BYTES +live live-media-path=PATH live live-media-timeout=SECONDS live {locale|debian-installer/locale}=LOCALE live module=NAME diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7 index 5fe0cec..4e17e6d 100644 --- a/manpages/live-initramfs.en.7 +++ b/manpages/live-initramfs.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-INITRAMFS 7 "2007\-07\-23" "1.91.6" "live\-initramfs" +.TH LIVE\-INITRAMFS 7 "2007\-07\-30" "1.95.1" "live\-initramfs" .SH NAME live\-initramfs \- Debian Live initramfs hook diff --git a/manpages/live-snapshot.en.1 b/manpages/live-snapshot.en.1 index 8380c0a..dfc2e65 100644 --- a/manpages/live-snapshot.en.1 +++ b/manpages/live-snapshot.en.1 @@ -1,4 +1,4 @@ -.TH LIVE\-SNAPSHOT 1 "2007\-07\-23" "1.91.6" "live\-initramfs" +.TH LIVE\-SNAPSHOT 1 "2007\-07\-30" "1.95.1" "live\-initramfs" .SH NAME live\-snapshot \- a simple script to ease persistence usage 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 |