[Debian-live-changes] r1510 - in dists/trunk/live-initramfs: docs scripts/live-bottom
daniel at alioth.debian.org
daniel at alioth.debian.org
Wed May 16 13:52:51 UTC 2007
Author: daniel
Date: 2007-05-16 13:52:51 +0000 (Wed, 16 May 2007)
New Revision: 1510
Modified:
dists/trunk/live-initramfs/docs/ChangeLog
dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check
dists/trunk/live-initramfs/scripts/live-bottom/02_timezone
dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf
dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints
dists/trunk/live-initramfs/scripts/live-bottom/10adduser
dists/trunk/live-initramfs/scripts/live-bottom/12fstab
dists/trunk/live-initramfs/scripts/live-bottom/13swap
dists/trunk/live-initramfs/scripts/live-bottom/14locales
dists/trunk/live-initramfs/scripts/live-bottom/15autologin
dists/trunk/live-initramfs/scripts/live-bottom/18hostname
dists/trunk/live-initramfs/scripts/live-bottom/19keyboard
dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
dists/trunk/live-initramfs/scripts/live-bottom/21xvidemode
dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data
dists/trunk/live-initramfs/scripts/live-bottom/22screensaver
dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules
dists/trunk/live-initramfs/scripts/live-bottom/23networking
dists/trunk/live-initramfs/scripts/live-bottom/24preseed
dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
dists/trunk/live-initramfs/scripts/live-bottom/30accessibility
dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier
dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation
dists/trunk/live-initramfs/scripts/live-bottom/33enable_apport_crashes
dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet
dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector
dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates
dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom
Log:
Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/docs/ChangeLog 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,3 +1,8 @@
+2007-06-12 Daniel Baumann <daniel at debian.org>
+
+ * scripts/live-bottom/*:
+ - Added generic header.
+
2007-05-12 Daniel Baumann <daniel at debian.org>
* scripts/live:
Modified: dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,18 +1,23 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
+# live-initramfs script
+
grep integrity-check /proc/cmdline && live-md5check /live_media /live_media/md5sum.txt < /dev/tty8
Modified: dists/trunk/live-initramfs/scripts/live-bottom/02_timezone
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/02_timezone 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/02_timezone 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,21 +1,31 @@
-#! /bin/sh
+#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Setting timezone..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Setting timezone..."
+
+# live-initramfs script
+
cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime
+
+log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Copying config on real root fs..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Copying config on real root fs..."
+
+# live-initramfs script
+
if [ -f /etc/live.conf ] ; then
if [ ! -z "${LIVECONF}" ]; then
# Updating live.conf
@@ -37,3 +43,5 @@
EOF
fi
+
+log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Moving mount points..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Moving mount points..."
+
+# live-initramfs script
+
# Move to the new root filesystem so that programs there can get at it.
if [ ! -d /root/live_media ]; then
mkdir -p /root/live_media
Modified: dists/trunk/live-initramfs/scripts/live-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/10adduser 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Adding live session user..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Adding live session user..."
+
+# live-initramfs script
+
if [ "${BUILD_SYSTEM}" == "Debian" ]; then
user_crypted="8Ab05sVQ4LLps" # as in `echo "live" | mkpasswd -s`
else
Modified: dists/trunk/live-initramfs/scripts/live-bottom/12fstab
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/12fstab 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/12fstab 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,26 +1,33 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Configuring fstab..."
-FSTAB=/root/etc/fstab
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Configuring fstab..."
+
+# live-initramfs script
+
+FSTAB=/root/etc/fstab
+
cat > $FSTAB <<EOF
unionfs / unionfs rw 0 0
tmpfs /tmp tmpfs nosuid,nodev 0 0
Modified: dists/trunk/live-initramfs/scripts/live-bottom/13swap
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/13swap 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/13swap 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,26 +1,33 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Setting up swap..."
-FSTAB=/root/etc/fstab
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Setting up swap..."
+
+# live-initramfs script
+
+FSTAB=/root/etc/fstab
+
if [ -n "${SWAPOFF}" ]
then
exit 0
Modified: dists/trunk/live-initramfs/scripts/live-bottom/14locales
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/14locales 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/14locales 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
-#! /bin/sh
+#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Setting up locales..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Setting up locales..."
+
+# live-initramfs script
+
if [ -e /root/etc/default/locale ]; then
grep_file=/root/etc/default/locale
elif [ -e /root/etc/environment ]; then # Old locales policy
Modified: dists/trunk/live-initramfs/scripts/live-bottom/15autologin
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/15autologin 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/15autologin 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Setting up automatic login..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Setting up automatic login..."
+
+# live-initramfs script
+
if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]; then
GDMCONF=/etc/gdm/gdm-cdd.conf
else
Modified: dists/trunk/live-initramfs/scripts/live-bottom/18hostname
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/18hostname 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/18hostname 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
-#! /bin/sh
+#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Setting hostname..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Setting hostname..."
+
+# live-initramfs script
+
echo "$HOSTNAME" > /root/etc/hostname
cat > /root/etc/hosts <<EOF
127.0.0.1 localhost
Modified: dists/trunk/live-initramfs/scripts/live-bottom/19keyboard
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/19keyboard 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/19keyboard 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Setting up console keyboard..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Setting up console keyboard..."
+
+# live-initramfs script
+
kbd=
cslayout=
csvariant=
Modified: dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/20xconfig 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/20xconfig 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Configuring X..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Configuring X..."
+
+# live-initramfs script
+
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
Modified: dists/trunk/live-initramfs/scripts/live-bottom/21xvidemode
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/21xvidemode 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/21xvidemode 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Configuring X kludges..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Configuring X kludges..."
+
+# live-initramfs script
+
if [ -n "$XVIDEOMODE" ]
then
mount -n -o bind /sys /root/sys
Modified: dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,32 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Configuring gnome-panel-data..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+
+log_begin_msg "Configuring gnome-panel-data..."
+
+# live-initramfs script
+
if [ -x /root/usr/sbin/laptop-detect ]; then
if chroot /root laptop-detect; then
live-reconfigure /root gnome-panel-data
Modified: dists/trunk/live-initramfs/scripts/live-bottom/22screensaver
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/22screensaver 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/22screensaver 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Configuring screensaver..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Configuring screensaver..."
+
+# live-initramfs script
+
gnome_screensaver_version=$(chroot /root dpkg-query -W --showformat='${Version}' gnome-screensaver 2>/dev/null) || gnome_screensaver_version=""
if [ -n "$gnome_screensaver_version" ]; then
# Support legacy gconf value
Modified: dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
-#! /bin/sh
+#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Preconfiguring /etc/modules..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Preconfiguring /etc/modules..."
+
+# live-initramfs script
+
case "$DPKG_ARCH" in
# load the right modules
powerpc|ppc64)
Modified: dists/trunk/live-initramfs/scripts/live-bottom/23networking
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/23networking 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/23networking 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,26 +1,33 @@
-#! /bin/sh
+#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Preconfiguring networking..."
-IFFILE="/root/etc/network/interfaces"
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Preconfiguring networking..."
+
+# live-initramfs script
+
+IFFILE="/root/etc/network/interfaces"
+
if [ "${STATICIP}" = "frommedia" -a -e "$IFFILE" ] ; then
# will use existent /etc/network/interfaces
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/24preseed
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/24preseed 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/24preseed 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
-#! /bin/sh
+#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Loading preseed file..."
-. /scripts/live-functions
-
-prereqs ()
+prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Loading preseed file..."
+
+# live-initramfs script
+
if [ -f "/root/${LOCATION}" ]; then
chroot /root debconf-set-selections < "/root/${LOCATION}"
fi
Modified: dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/25configure_init 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/25configure_init 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Setting up init..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Setting up init..."
+
+# live-initramfs script
+
# Arrange for shells on virtual consoles, rather than login prompts
if [ -n "$USERNAME" ]; then
Modified: dists/trunk/live-initramfs/scripts/live-bottom/30accessibility
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/30accessibility 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/30accessibility 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Configuring accessibility options..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Configuring accessibility options..."
+
+# live-initramfs script
+
gconf_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gconf2 2>/dev/null) || gconf_version=""
gct() {
Modified: dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Disabling update-notifier..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Disabling update-notifier..."
+
+# live-initramfs script
+
# For GNOME, we divert away apt-check to avoid a regular 'apt-get update'
# equivalent in the live session. We want to run update-notifier for crash
# report handling.
Modified: dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,26 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Configuring power management..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+log_begin_msg "Configuring power management..."
+
+# live-initramfs script
+
gpm_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-power-manager 2>/dev/null) || panel_version=""
if [ -n "$gpm_version" ]; then
# live-reconfigure /root gnome-power-manager
Modified: dists/trunk/live-initramfs/scripts/live-bottom/33enable_apport_crashes
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/33enable_apport_crashes 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/33enable_apport_crashes 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Enabling notifications about program crashes..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Enabling notifications about program crashes..."
+
+# live-initramfs script
+
update_notifier_version=$(chroot /root dpkg-query -W --showformat='${Version}' update-notifier 2>/dev/null) || update_notifier_version=""
if [ -n "$update_notifier_version" ]; then
chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/update-notifier/show_apport_crashes true
Modified: dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
-#! /bin/sh
+#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Disabling kwallet..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Disabling kwallet..."
+
+# live-initramfs script
+
rm -f /root/usr/share/services/kded/kwalletd.desktop
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,25 +1,31 @@
-#! /bin/sh
+#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Fixing language selector..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+. /scripts/live-functions
+
+log_begin_msg "Fixing language selector..."
+
+# live-initramfs script
+
if [ -e /root/usr/share/applications/language-selector.desktop ]; then
sed -i '/^Exec/ s|/usr/bin/gnome-language-selector|"& -n"|' /root/usr/share/applications/language-selector.desktop
Modified: dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,29 +1,35 @@
-#! /bin/sh
+#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Installing driver updates..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Installing driver updates..."
+
+# live-initramfs script
+
if [ ! -d /tmp/driver-updates ]; then
exit 0
fi
-log_begin_msg "$DESCRIPTION"
-
install_dir=/var/cache/driver-updates
mkdir "/root$install_dir"
Modified: dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom 2007-05-16 13:27:07 UTC (rev 1509)
+++ dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom 2007-05-16 13:52:51 UTC (rev 1510)
@@ -1,24 +1,34 @@
-#! /bin/sh
+#!/bin/sh
+set -e
+
+# initramfs-tools header
+
PREREQ=""
-DESCRIPTION="Adding APT-CDROM source..."
-. /scripts/live-functions
-
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Adding APT-CDROM source..."
+
+# live-initramfs script
+
mkdir -p /root/cdrom
mount -n -o bind /cdrom /root/cdrom
chroot /root apt-cdrom -m add
umount /root/cdrom
+
+log_end_msg
More information about the Debian-live-changes
mailing list