[SCM] debian-live/live-initramfs branch, master, updated. 1.99.2-1-42-ga836d70
Daniel Baumann
daniel at debian.org
Thu Oct 4 06:44:57 UTC 2007
The branch, master has been updated
via a836d70968f21f70708a99b66c464733f27de8c3 (commit)
via eca87bb4d1790152899062adc9bec43c3cf2ec6e (commit)
from e8ab81e516713457b566f920b377f3fcecc93e3a (commit)
- Shortlog ------------------------------------------------------------
a836d70 Bumping version to 1.107.1-1.
eca87bb Merging casper 1.107.
Summary of changes:
Makefile | 2 +-
debian/changelog | 2 +-
debian/init | 4 +++-
docs/ChangeLog.casper | 13 +++++++++++++
docs/parameters.txt | 2 +-
manpages/live-initramfs.en.7.txt | 4 ++++
scripts/live | 5 +++++
scripts/live-bottom/20xconfig | 7 ++++++-
scripts/live-bottom/25configure_init | 7 +++++--
scripts/live-bottom/32disable_hibernation | 5 +++--
10 files changed, 42 insertions(+), 9 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit a836d70968f21f70708a99b66c464733f27de8c3
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Oct 4 08:44:48 2007 +0200
Bumping version to 1.107.1-1.
diff --git a/Makefile b/Makefile
index 5dcc5a5..459605d 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ update:
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.106.1/1.106.2/' \
+ -e 's/1.107.1/1.107.2/' \
$$FILE; \
done
diff --git a/debian/changelog b/debian/changelog
index 43126b1..344adce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-live-initramfs (1.106.1-1) UNRELEASED; urgency=medium
+live-initramfs (1.107.1-1) UNRELEASED; urgency=medium
* New upstream release.
diff --git a/docs/parameters.txt b/docs/parameters.txt
index cd39ae7..bbf1157 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
Boot Parameters for Debian Live
-------------------------------
-Updated for live-initramfs 1.106.1-1 on 2007-10-01.
+Updated for live-initramfs 1.107.1-1 on 2007-10-01.
These options (can be combined) work from the bootloader prompt:
commit eca87bb4d1790152899062adc9bec43c3cf2ec6e
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Oct 4 08:43:54 2007 +0200
Merging casper 1.107.
diff --git a/debian/init b/debian/init
index b083781..a24fe9f 100644
--- a/debian/init
+++ b/debian/init
@@ -86,8 +86,10 @@ do_stop ()
eject -p -m /live/image >/dev/null 2>&1
fi
+ stty sane < /dev/console
+
# XXX - i18n
- echo "Please remove the disc and close the tray (if any) then press ENTER: "
+ echo "Please remove the disc and close the tray (if any) then press ENTER: " > /dev/console
if [ -x /sbin/usplash_write ]; then
/sbin/usplash_write "TIMEOUT 86400"
/sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)"
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 08daa0e..b1f55c9 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,16 @@
+casper (1.107) gutsy; urgency=low
+
+ * Fix gconf keys for suspend and hibernate (thanks, Oliver Grawert;
+ LP: #144790).
+ * Enable suspend again since as far as I can see we no longer need to
+ probe DMI while figuring out whether to enable it (see #61535).
+ * Add a 'textonly' boot option to disable X (LP: #65818).
+ * Write the please-remove-CD message to /dev/console so that it works even
+ if usplash isn't running, and make sure to set /dev/console into a sane
+ state so that pressing Enter doesn't just result in ^M being displayed.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Tue, 02 Oct 2007 15:12:57 +0100
+
casper (1.106) gutsy; urgency=low
* Support preseed/early_command; code supplied here will be run using 'sh
diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index a52f025..c197abb 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -219,6 +219,10 @@ This parameter will make live-initramfs to show on "/" the ro filesystems
lead to problems by applications like "mono" which store binary paths on
installation.
+ textonly
+
+Start up to text-mode shell prompts, disabling the graphical user interface.
+
timezone=**TIMEZONE**::
By default, timezone is set to UTC. Using the timezone parameter, you can set it
diff --git a/scripts/live b/scripts/live
index 43d3dde..b1157c5 100755
--- a/scripts/live
+++ b/scripts/live
@@ -336,6 +336,11 @@ Arguments ()
export SHOWMOUNTS
;;
+ textonly)
+ TEXTONLY="Yes"
+ export TEXTONLY
+ ;;
+
timezone=*)
TIMEZONE="${ARGUMENT#timezone=}"
export TIMEZONE
diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 8d315a5..779a1c2 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -34,7 +34,12 @@ log_begin_msg "Configuring X..."
if [ "${TERM_TYPE}" = "serial" ]
then
# Don't bother trying to configure or start X on a serial console
- rm -f /etc/rc?.d/S??[gxk]dm
+ rm -f /root/etc/rc?.d/S??[gkx]dm
+ exit 0
+fi
+
+if [ -n "${TEXTONLY}" ]
+then
exit 0
fi
diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index b2a191c..bec5608 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -89,8 +89,11 @@ then
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
+ rm -f /root/etc/rc?.d/[SK]??[gkx]dm
+ ;;
+
+ textonly)
+ rm -f /root/etc/rc?.d/[SK]??[gkx]dm
;;
esac
done
diff --git a/scripts/live-bottom/32disable_hibernation b/scripts/live-bottom/32disable_hibernation
index 708db5c..f77c668 100755
--- a/scripts/live-bottom/32disable_hibernation
+++ b/scripts/live-bottom/32disable_hibernation
@@ -36,13 +36,14 @@ gpm_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnom
if [ -n "${gpm_version}" ]
then
#live-reconfigure /root gnome-power-manager
+ # Gnome < 2.20
chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gnome-power-manager/can_hibernate false
- chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gnome-power-manager/can_suspend false
+ # Gnome >= 2.20
+ chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gnome-power-manager/general/can_hibernate false
fi
if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]
then
- echo "disableSuspend=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/power-managerrc
echo "disableHibernate=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/power-managerrc
fi
--
debian-live/live-initramfs
More information about the debian-live-changes
mailing list