[SCM] live-initramfs branch, upstream, updated. upstream/1.199.1-1-g0e30bd5
Daniel Baumann
daniel at debian.org
Sun May 2 14:05:54 UTC 2010
The following commit has been merged in the upstream branch:
commit 0e30bd5d6366275cd0465e45b2ac270a81a90157
Author: Daniel Baumann <daniel at debian.org>
Date: Sun May 2 15:54:27 2010 +0200
Adding upstream version 1.215.1.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 25b004d..2bed515 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,162 @@
+casper (1.215) lucid; urgency=low
+
+ [ Mario Limonciello ]
+ * Support multiple preseed file/urlarguments on the kernel commandline
+ rather than just selecting the last one and going with that.
+ * debian/control: Set Vcs-Bzr.
+
+ [ Jonathan Riddell ]
+ * Add scripts/casper-bottom/48enable_kubuntu_netbook and ubiquity-
+ hooks/48enable_kubuntu_netbook to enable Plasma Netbook workspace
+ for Kubuntu Netbook Remix
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 27 Jan 2010 13:55:42 +0000
+
+casper (1.214) lucid; urgency=low
+
+ * 15autologin: simplify the code with escape character evaluation
+ (LP: #505140)
+
+ -- Didier Roche <didrocks at ubuntu.com> Tue, 12 Jan 2010 08:57:05 +0100
+
+casper (1.213) lucid; urgency=low
+
+ * printf does not evaluate escape characters in the argument string.
+
+ -- Evan Dandrea <evand at ubuntu.com> Mon, 11 Jan 2010 11:02:12 +0000
+
+casper (1.212) lucid; urgency=low
+
+ [ Martin Pitt ]
+ * debian/control: Add ${misc:Depends}.
+ * debian/control: Bump Standards-Version to 3.8.3 (no changes necessary).
+
+ [ Colin Watson ]
+ * 15autologin: Use printf rather than echo -e, since its behaviour is
+ portable across shells.
+
+ [ Evan Dandrea ]
+ * Remove scripts/casper-bottom/42disable_apparmor. Apparmor
+ 2.3.1+bzr1312-0ubuntu3 and ifupdown 0.6.8ubuntu26 now no-op when
+ they detect the live CD environment.
+
+ -- Evan Dandrea <evand at ubuntu.com> Fri, 08 Jan 2010 19:56:27 +0000
+
+casper (1.211) lucid; urgency=low
+
+ * Readd scripts/casper-bottom/15autologin changes: derivatives have
+ now a custom.conf file and still need autologin in live version.
+ Merge with my previous fix proposed for sponsoring one week ago:
+ use echo -e to enable \n interpretation (/bin/sh is busybox ash
+ which behavior differs from vanilla ash interpretor) (LP: #500786)·
+
+ -- Didier Roche <didrocks at ubuntu.com> Tue, 05 Jan 2010 20:05:26 +0100
+
+casper (1.210) lucid; urgency=low
+
+ [ Scott James Remnant ]
+ * Dropped Vcs-Bzr headers, pushed to lp:ubuntu/casper
+ * conf-hooks.d/casper: Changed to FRAMEBUFFER=y
+
+ [ Colin Watson ]
+ * Source /scripts/casper-functions and /scripts/casper-helpers only after
+ processing 'prereqs' argument, to avoid lots of warnings with new
+ initramfs-tools.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Tue, 05 Jan 2010 16:54:54 +0000
+
+casper (1.209) lucid; urgency=low
+
+ * Revert the previous change to 15autologin and instead just make sure
+ custom.conf does not exist.
+
+ -- Evan Dandrea <evand at ubuntu.com> Mon, 04 Jan 2010 11:18:47 +0000
+
+casper (1.208) lucid; urgency=low
+
+ [ Martin Pitt ]
+ * scripts/casper-bottom/25configure_init: sreadahead is no more, disable
+ ureadahead instead.
+
+ [ Didier Roche ]
+ * scripts/casper-bottom/15autologin: Don't erase /etc/gdm/custom.conf but
+ only append autologin on casper startup if needed. This avoids removing
+ default session set in this file for ubuntu derivatives which use GDM.
+ The script also check if the modification is already there for
+ persistent usb keys. (LP: #498971)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Mon, 21 Dec 2009 15:54:36 +0100
+
+casper (1.207) lucid; urgency=low
+
+ * Drop 46_disable_services. It didn't need to be running on "all" systems
+ with casper installed. Mythbuntu systems will pull this in via a package
+ that is administerable via ~mythbuntu-dev.
+
+ -- Mario Limonciello <superm1 at ubuntu.com> Tue, 24 Nov 2009 22:28:29 -0600
+
+casper (1.206) karmic; urgency=low
+
+ * Fix broken /cdrom writable test in 43disable_initramfs
+ (LP: #450259).
+
+ -- Evan Dandrea <evand at ubuntu.com> Thu, 22 Oct 2009 11:49:15 +0100
+
+casper (1.205) karmic; urgency=low
+
+ * scripts/casper-bottom/25configure_init: Disable sreadahead on live CD
+ boot. Not only does it profile the live CD boot to no benefit, but it
+ also looks as if it may be responsible for breaking Wubi installs by
+ reading from partman's synchronisation FIFOs (LP: #439279).
+
+ -- Colin Watson <cjwatson at ubuntu.com> Tue, 20 Oct 2009 17:32:02 +0100
+
+casper (1.204) karmic; urgency=low
+
+ * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+ - .pulse_a11y_nostart -> pulse_a11y_nostart due to being in a system
+ directory, to completely match the change in pulseaudio, which I missed
+ earlier.
+
+ -- Luke Yelavich <themuso at ubuntu.com> Wed, 14 Oct 2009 08:29:07 +1100
+
+casper (1.203) karmic; urgency=low
+
+ * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+ - Change .pulse_a11y_nostart location to /var/lib/pulseaudio, as per
+ the change in pulseaudio itself, to solve a race condition with volume
+ settings restore.
+
+ -- Luke Yelavich <themuso at ubuntu.com> Mon, 12 Oct 2009 08:31:51 +1100
+
+casper (1.202) karmic; urgency=low
+
+ * scripts/casper-bottom/46_disable_services:
+ - MythTV backend is now an upstart service, so rename it's conf file
+ in /etc/init, rather than using update-rc.d.
+
+ -- Mario Limonciello <superm1 at ubuntu.com> Sun, 11 Oct 2009 13:47:00 -0500
+
+casper (1.201) karmic; urgency=low
+
+ [ Colin Watson ]
+ * Don't prompt to eject the SD card on Babbage boards, since for now it's
+ reused as a quasi-boot-floppy (LP: #364273).
+
+ [ James Westby ]
+ * scripts/casper-bottom/44pk_allow_ubuntu: update to work for polkit-1
+ as well. Allow the live cd user to perform any action when at the
+ active console. (LP: #447141)
+
+ -- Colin Watson <cjwatson at ubuntu.com> Fri, 09 Oct 2009 16:06:53 +0100
+
+casper (1.200) karmic; urgency=low
+
+ * scripts/casper-bottom/20xconfig:
+ - Fix xforcevesa to generate a good failsafe xorg.conf (LP: #423969)
+
+ -- Mario Limonciello <superm1 at ubuntu.com> Thu, 08 Oct 2009 22:26:42 -0500
+
casper (1.199) karmic; urgency=low
[ Tormod Volden ]
diff --git a/scripts/live b/scripts/live
index 76b0be4..6f4f5c1 100755
--- a/scripts/live
+++ b/scripts/live
@@ -46,6 +46,7 @@ fi
Arguments ()
{
PRESEEDS=""
+ LOCATIONS=""
for ARGUMENT in $(cat /proc/cmdline)
do
@@ -418,8 +419,8 @@ Arguments ()
;;
preseed/file=*|file=*)
- LOCATION="${ARGUMENT#*=}"
- export LOCATION
+ LOCATIONS="${ARGUMENT#*=} ${LOCATIONS}"
+ export LOCATIONS
;;
nopreseed)
@@ -428,7 +429,7 @@ Arguments ()
;;
url=*)
- location="${ARGUMENT#url=}"
+ URL_LOCATION="${ARGUMENT#url=}"
mount -o bind /sys /root/sys
mount -o bind /proc /root/proc
@@ -436,14 +437,14 @@ Arguments ()
mkdir -p /root/var/run/network
[ "${NETBOOT}" ] || chroot /root dhclient eth0
- chroot /root wget -P /tmp "${location}"
+ chroot /root wget -P /tmp "${URL_LOCATION}"
[ "${NETBOOT}" ] || chroot /root ifconfig eth0 down
umount /root/sys
umount /root/proc
umount /root/dev
- LOCATION="/tmp/$(basename "${location}")"
+ LOCATIONS="/tmp/$(basename ${URL_LOCATION}) ${LOCATIONS}"
;;
*/*=*)
@@ -779,6 +780,10 @@ do_netmount ()
udevadm trigger
udevadm settle
+ if [ -z "${NETBOOT}" ] && [ -z "${FETCH}" ] && \
+ [ -z "${HTTPFS}" ] && [ -z "${FTPFS}" ]
+ then
+
# if ethdevice was not specified on the kernel command line
# make sure we try to get a working network configuration
# for *every* present network device (except for loopback of course)
@@ -822,6 +827,10 @@ do_netmount ()
fi
done
+ else
+ ipconfig ${DEVICE} | tee /netboot.config
+ fi
+
# source relevant ipconfig output
OLDHOSTNAME=${HOSTNAME}
. /tmp/net-${DEVICE}.conf
diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 3f85d50..a4df2df 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -57,16 +57,21 @@ then
${GDMCONF}
elif [ -d /root/etc/gdm3 ]
then
+ GDMCustomFile=/root/etc/gdm3/custom.conf
+ AutologinParameters="AutomaticLoginEnable=true\n\
+AutomaticLogin=$USERNAME\n\
+TimedLoginEnable=true\n\
+TimedLogin=$USERNAME\n\
+TimedLoginDelay=10"
+
+ # Prevent from updating if parameters already present (persistent usb
+ # key)
+ if ! $(grep -qs '\[daemon\]' $GDMCustomFile)
+ then
+ echo '[daemon]' >> $GDMCustomFile
+ fi
-cat > /root/etc/gdm3/custom.conf << EOF
-[daemon]
-AutomaticLoginEnable=true
-AutomaticLogin=$USERNAME
-TimedLoginEnable=true
-TimedLogin=$USERNAME
-TimedLoginDelay=10
-EOF
-
+ sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile
fi
if [ -d /root/etc/default/kdm.d/ ]
diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index d06b2d6..e2839b2 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -29,13 +29,6 @@ fi
# live-initramfs script
-if [ "${TERM_TYPE}" = "serial" ]
-then
- # Don't bother trying to configure or start X on a serial console
- rm -f /root/etc/rc?.d/S??[gkx]dm
- exit 0
-fi
-
if [ -n "${TEXTONLY}" ]
then
exit 0
@@ -48,37 +41,47 @@ fi
log_begin_msg "Configuring X"
-locale=en_US.UTF-8
+if ! grep -q xforcevesa /proc/cmdline 2>&1 >/dev/null
+then
+ if [ "${TERM_TYPE}" = "serial" ]
+ then
+ # Don't bother trying to configure or start X on a serial
+ # console
+ rm -f /root/etc/rc?.d/S??[gkx]dm
+ exit 0
+ fi
-mount -o bind /sys /root/sys
-mount -o bind /proc /root/proc
-mount -o bind /dev /root/dev
+ locale=en_US.UTF-8
-if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]
-then
- # xdebconfigurator
- chroot /root /usr/sbin/xdebconfigurator
-fi
+ mount -o bind /sys /root/sys
+ mount -o bind /proc /root/proc
+ mount -o bind /dev /root/dev
-if [ -n "${KOPTIONS}" ]
-then
- setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
-fi
+ if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]
+ then
+ # xdebconfigurator
+ chroot /root /usr/sbin/xdebconfigurator
+ fi
-if [ -n "${KVARIANT}" ]
-then
- setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
-fi
+ if [ -n "${KOPTIONS}" ]
+ then
+ setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
+ fi
-if [ -n "${KMODEL}" ]
-then
- setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
-fi
+ if [ -n "${KVARIANT}" ]
+ then
+ setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
+ fi
-if [ -n "${KLAYOUT}" ]
-then
- setlayout="set xserver-xorg/config/inputdevice/keyboard/layout ${KLAYOUT}"
-fi
+ if [ -n "${KMODEL}" ]
+ then
+ setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
+ fi
+
+ if [ -n "${KLAYOUT}" ]
+ then
+ setlayout="set xserver-xorg/config/inputdevice/keyboard/layout ${KLAYOUT}"
+ fi
chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
${setlayout}
@@ -87,11 +90,32 @@ ${setmodel}
${setoptions}
EOF
-live-reconfigure /root xserver-xorg 2>&1 \
- | grep -v "overwriting possibly-customised configuration" \
- | grep -v "file; backup in /etc/X11/xorg.conf"
-umount /root/sys
-umount /root/proc
-umount /root/dev
+ live-reconfigure /root xserver-xorg 2>&1 \
+ | grep -v "overwriting possibly-customised configuration" \
+ | grep -v "file; backup in /etc/X11/xorg.conf"
+
+ umount /root/sys
+ umount /root/proc
+ umount /root/dev
+else
+
+cat > /root/etc/X11/xorg.conf << EOF
+Section "Device"
+ Identifier "Configured Video Device"
+ Driver "vesa"
+EndSection
+
+Section "Monitor"
+ Identifier "Configured Monitor"
+EndSection
+
+Section "Screen"
+ Identifier "Default Screen"
+ Monitor "Configured Monitor"
+ Device "Configured Video Device"
+EndSection
+EOF
+
+fi
log_end_msg
diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index 2536bd0..7dd6394 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -36,9 +36,12 @@ then
chroot /root debconf-set-selections < /preseed.cfg
fi
-if [ -f "/root/${LOCATION}" ]
+if [ -n "${LOCATIONS}" ]
then
- chroot /root debconf-set-selections < "/root/${LOCATION}"
+ for item in ${LOCATIONS}
+ do
+ chroot /root debconf-set-selections < "/root${ITEM}"
+ done
fi
if [ -n "${PRESEEDS}" ]
diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index 67e21a6..db23f19 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -108,6 +108,11 @@ then
chmod -x /root/sbin/readahead-list
fi
+# Disable ureadahead too since we don't ship a pack file for it anyway, so
+# all we'll end up doing is profiling the live CD boot. ureadahead also
+# breaks partman occasionally by reading from its synchronisation FIFOs.
+rm -f /root/etc/init/ureadahead.conf
+
log_end_msg
exit 0
diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 45d1aa1..4624077 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -116,8 +116,9 @@ case ${ACCESS} in
remove_applet fast_user_switch
if [ -x /root/usr/bin/pulse-session ]
then
- touch /root/home/$USERNAME/.pulse_a11y_nostart
- chroot /root chown $USERNAME.$USERNAME /home/$USERNAME/.pulse_a11y_nostart
+ mkdir -p /root/var/lib/pulseaudio
+ touch /root/var/lib/pulseaudio/pulse_a11y_nostart
+ chroot /root chown root.root /var/lib/pulseaudio/pulse_a11y_nostart
mkdir -p /root/home/$USERNAME/.pulse
echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf
chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse
@@ -150,8 +151,9 @@ case ${ACCESS} in
if [ -x /root/usr/bin/pulse-session ]
then
- touch /root/home/$USERNAME/.pulse_a11y_nostart
- chroot /root chown $USERNAME.$USERNAME /home/$USERNAME/.pulse_a11y_nostart
+ mkdir -p /root/var/lib/pulseaudio
+ touch /root/var/lib/pulseaudio/pulse_a11y_nostart
+ chroot /root chown root.root /var/lib/pulseaudio/pulse_a11y_nostart
mkdir -p /root/home/$USERNAME/.pulse
echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf
chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse
diff --git a/scripts/live-bottom/42disable_apparmor b/scripts/live-bottom/42disable_apparmor
deleted file mode 100755
index f87cab4..0000000
--- a/scripts/live-bottom/42disable_apparmor
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# live-initramfs header
-
-if [ -n "${NOAPPARMOR}" ]
-then
- exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Disabling AppArmor (does not work with stacked file systems)"
-
-# live-initramfs script
-
-if [ -x /root/etc/init.d/apparmor ]
-then
- chroot /root update-rc.d -f apparmor remove
-fi
-
-log_end_msg
diff --git a/scripts/live-bottom/43disable_updateinitramfs b/scripts/live-bottom/43disable_updateinitramfs
index 6ceeacf..0a6c7c0 100755
--- a/scripts/live-bottom/43disable_updateinitramfs
+++ b/scripts/live-bottom/43disable_updateinitramfs
@@ -31,7 +31,8 @@ chroot /root dpkg-divert --add --rename --quiet \
# Running off a USB disk or other writable media.
if [ -w /root/cdrom ] && \
- ! grep -q '^[^ ]* /root/cdrom [^ ]* [^ ]*\<ro\>' /proc/mounts
+ # rw is guaranteed to be first.
+ grep -q ' /root/cdrom rw[, ]' /proc/self/mountinfo
then
cat > /root/usr/sbin/update-initramfs << 'EOF'
diff --git a/scripts/live-bottom/44pk_allow b/scripts/live-bottom/44pk_allow
index fec6401..a211880 100755
--- a/scripts/live-bottom/44pk_allow
+++ b/scripts/live-bottom/44pk_allow
@@ -57,4 +57,15 @@ cat << EOF >> /root/etc/PolicyKit/PolicyKit.conf
</config>
EOF
+mkdir -p /root/var/lib/polkit-1/localauthority/10-vendor.d
+cat << EOF > /root/var/lib/polkit-1/localauthority/10-vendor.d/10-live-cd.pkla
+# Policy to allow the livecd user to bypass policykit
+[Live CD user permissions]
+Identity=unix-user:$USERNAME
+Action=*
+ResultAny=no
+ResultInactive=no
+ResultActive=yes
+EOF
+
log_end_msg
--
live-initramfs
More information about the debian-live-changes
mailing list