[Debian-live-changes] r1455 -
dists/trunk/live-initramfs/scripts/live-bottom
Daniel Baumann
daniel at alioth.debian.org
Fri May 11 10:45:35 UTC 2007
Author: daniel
Date: 2007-05-11 10:45:35 +0000 (Fri, 11 May 2007)
New Revision: 1455
Modified:
dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check
dists/trunk/live-initramfs/scripts/live-bottom/01live.conf
dists/trunk/live-initramfs/scripts/live-bottom/02timezone
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/19xvideomode
dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
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/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/scripts/live-bottom/00integrity-check
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check 2007-05-11 10:45:35 UTC (rev 1455)
@@ -2,6 +2,8 @@
set -e
+# initramfs-tools header
+
PREREQ=""
prereqs()
@@ -16,4 +18,6 @@
;;
esac
+# integrity-check
+
grep integrity-check /proc/cmdline && live-md5check /live_media /live_media/md5sum.txt < /dev/tty8
Modified: dists/trunk/live-initramfs/scripts/live-bottom/01live.conf
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/01live.conf 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/01live.conf 2007-05-11 10:45:35 UTC (rev 1455)
@@ -2,7 +2,8 @@
set -e
-DESCRIPTION="Copying config on real root fs..."
+# initramfs-tools header
+
PREREQ=""
prereqs()
@@ -17,8 +18,12 @@
;;
esac
+# live.conf
+
. /scripts/live-functions
+DESCRIPTION="Copying config on real root fs..."
+
log_begin_msg "${DESCRIPTION}"
if [ -f /etc/live.conf ]
Modified: dists/trunk/live-initramfs/scripts/live-bottom/02timezone
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/02timezone 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/02timezone 2007-05-11 10:45:35 UTC (rev 1455)
@@ -2,7 +2,8 @@
set -e
-DESCRIPTION="Setting timezone..."
+# initramfs-tools header
+
PREREQ=""
prereqs()
@@ -17,6 +18,10 @@
;;
esac
+# timezone
+
. /scripts/live-functions
+DESCRIPTION="Setting timezone..."
+
cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime
Modified: dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints 2007-05-11 10:45:35 UTC (rev 1455)
@@ -2,7 +2,8 @@
set -e
-DESCRIPTION="Moving mount points..."
+# initramfs-tools header
+
PREREQ=""
prereqs()
@@ -17,8 +18,12 @@
;;
esac
+# mountpoints
+
. /scripts/live-functions
+DESCRIPTION="Moving mount points..."
+
log_begin_msg "$DESCRIPTION"
# Move to the new root filesystem so that programs there can get at it.
Modified: dists/trunk/live-initramfs/scripts/live-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/10adduser 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser 2007-05-11 10:45:35 UTC (rev 1455)
@@ -2,7 +2,8 @@
set -e
-DESCRIPTION="Adding live session user..."
+# initramfs-tools header
+
PREREQ=""
prereqs()
@@ -17,8 +18,12 @@
;;
esac
+# adduser
+
. /scripts/live-functions
+DESCRIPTION="Adding live session user..."
+
log_begin_msg "$DESCRIPTION"
if [ "${BUILD_SYSTEM}" = "Debian" ]
Modified: dists/trunk/live-initramfs/scripts/live-bottom/12fstab
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/12fstab 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/12fstab 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,24 +1,30 @@
#!/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
+# fstab
+
+FSTAB=/root/etc/fstab
+DESCRIPTION="Configuring fstab..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
cat > $FSTAB <<EOF
Modified: dists/trunk/live-initramfs/scripts/live-bottom/13swap
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/13swap 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/13swap 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,44 +1,57 @@
#!/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
+# swap
+
+DESCRIPTION="Setting up swap..."
+FSTAB=/root/etc/fstab
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
devices=""
-for device in /dev/[hs]d[a-z][0-9]*; do
- if ! [ -b "$device" ]; then
- continue
- fi
- magic=$(/bin/dd if="$device" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
-
- if [ "$magic" = "SWAPSPACE2" -o "$magic" = "SWAP-SPACE" ]; then
-# log "Found $device"
- devices="$devices $device"
- fi
+for device in /dev/[hs]d[a-z][0-9]*
+do
+ if ! [ -b "$device" ]
+ then
+ continue
+ fi
+
+ magic=$(/bin/dd if="$device" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
+
+ if [ "$magic" = "SWAPSPACE2" -o "$magic" = "SWAP-SPACE" ]
+ then
+ #log "Found $device"
+ devices="$devices $device"
+ fi
done
-for device in $devices; do
- cat >> $FSTAB <<EOF
+for device in $devices
+do
+
+cat >> $FSTAB << EOF
$device swap swap defaults 0 0
EOF
+
done
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/14locales
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/14locales 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/14locales 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,81 +1,99 @@
-#! /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
+# locales
+
+DESCRIPTION="Setting up locales..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
-if [ -e /root/etc/default/locale ]; then
- grep_file=/root/etc/default/locale
-elif [ -e /root/etc/environment ]; then # Old locales policy
- grep_file=/root/etc/environment
+if [ -e /root/etc/default/locale ]
+then
+ grep_file=/root/etc/default/locale
+elif [ -e /root/etc/environment ] # Old locales policy
+then
+ grep_file=/root/etc/environment
fi
-if [ -n "${grep_file}" ]; then
- # use rootfs configured locale
- locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
+if [ -n "${grep_file}" ]
+then
+ # use rootfs configured locale
+ locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
else
- grep_file=/root/etc/default/locale
+ grep_file=/root/etc/default/locale
fi
# commandline
-if [ ! -z "${LOCALE}" ]; then
- locale="${LOCALE}"
- set_locale="true"
+if [ ! -z "${LOCALE}" ]
+then
+ locale="${LOCALE}"
+ set_locale="true"
fi
-if [ -z "${locale}" ]; then
- # Set a default one
- locale=en_US.UTF-8
- set_locale="true"
+if [ -z "${locale}" ]
+then
+ # Set a default one
+ locale=en_US.UTF-8
+ set_locale="true"
fi
-if [ "${set_locale}" ]; then
- if echo "${locale}" | grep -sqE '^[[:lower:]]{2}$' ; then
- # input is like "locale=it", so we will convert and setup also the keyboard if not already set
- if [ -z "${KBD}" ]; then
- # FIXME: look if this keyb is supported
- KBD="${locale}"
- really_export KBD
+if [ "${set_locale}" ]
+then
+ if echo "${locale}" | grep -sqE '^[[:lower:]]{2}$'
+ then
+ # input is like "locale=it", so we will convert and setup also the keyboard if not already set
+
+ if [ -z "${KBD}" ]
+ then
+ # FIXME: look if this keyb is supported
+ KBD="${locale}"
+ really_export KBD
+ fi
+
+ uploc=$(echo "${locale}" | tr '[a-z]' '[A-Z]')
+ locale="${locale}_${uploc}.UTF-8"
fi
- uploc=$(echo "${locale}" | tr '[a-z]' '[A-Z]')
- locale="${locale}_${uploc}.UTF-8"
- fi
- LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
+ LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
- if [ -z "${LANG}" ]; then
- log_warning_message "Locale ${locale} is unsupported."
- locale="en_US.UTF-8"
- LANG="${locale}"
- fi
+ if [ -z "${LANG}" ]
+ then
+ log_warning_message "Locale ${locale} is unsupported."
+ locale="en_US.UTF-8"
+ LANG="${locale}"
+ fi
- really_export LANG
+ really_export LANG
- if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
- printf 'LANG="%s"\n' "${LANG}" > "${grep_file}"
- chroot /root /usr/sbin/locale-gen "${LANG}"
- live-preseed /root debian-installer/locale "${locale}"
- else
- printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
- printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
- chroot /root /usr/sbin/locale-gen
- fi
+ if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+ then
+ printf 'LANG="%s"\n' "${LANG}" > "${grep_file}"
+ chroot /root /usr/sbin/locale-gen "${LANG}"
+ live-preseed /root debian-installer/locale "${locale}"
+ else
+ printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
+ printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
+ chroot /root /usr/sbin/locale-gen
+ fi
fi
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/15autologin
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/15autologin 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/15autologin 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,67 +1,81 @@
#!/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
+# autologin
+
+DESCRIPTION="Setting up automatic login..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
-if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]; then
- GDMCONF=/etc/gdm/gdm-cdd.conf
+if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]
+then
+ GDMCONF=/etc/gdm/gdm-cdd.conf
else
- GDMCONF=/etc/gdm/gdm.conf
+ GDMCONF=/etc/gdm/gdm.conf
fi
-if chroot /root [ -f ${GDMCONF} ]; then
- if [ "${BUILD_SYSTEM}" = "Debian" ]; then
- # true hack ! -- nohar
- chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
- fi
+if chroot /root [ -f ${GDMCONF} ]
+then
+ if [ "${BUILD_SYSTEM}" = "Debian" ]
+ then
+ # true hack ! -- nohar
+ chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
+ fi
- # Configure GDM autologin
- chroot /root sed -i \
- -e "s/^AutomaticLoginEnable=.*\$/AutomaticLoginEnable=true/" \
- -e "s/^AutomaticLogin=.*\$/AutomaticLogin=$USERNAME/" \
- -e "s/^TimedLoginEnable=.*\$/TimedLoginEnable=true/" \
- -e "s/^TimedLogin=.*\$/TimedLogin=$USERNAME/" \
- -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
- ${GDMCONF}
+ # Configure GDM autologin
+ chroot /root sed -i \
+ -e "s/^AutomaticLoginEnable=.*\$/AutomaticLoginEnable=true/" \
+ -e "s/^AutomaticLogin=.*\$/AutomaticLogin=$USERNAME/" \
+ -e "s/^TimedLoginEnable=.*\$/TimedLoginEnable=true/" \
+ -e "s/^TimedLogin=.*\$/TimedLogin=$USERNAME/" \
+ -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
+ ${GDMCONF}
fi
-if [ -f /root/etc/kde3/kdm/kdmrc ]; then
- # Configure KDM autologin
- sed -i -r \
- -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
- -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \
- -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
- /root/etc/kde3/kdm/kdmrc
+if [ -f /root/etc/kde3/kdm/kdmrc ]
+then
+ # Configure KDM autologin
+ sed -i -r \
+ -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
+ -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \
+ -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
+ /root/etc/kde3/kdm/kdmrc
fi
-if chroot /root /usr/bin/which kpersonalizer >/dev/null; then
- # Disable first-login wizard for KDE
- if [ ! -f /root/etc/kde3/kpersonalizerrc ]; then
- cat > /root/etc/kde3/kpersonalizerrc <<EOF
+if chroot /root /usr/bin/which kpersonalizer >/dev/null
+then
+ # Disable first-login wizard for KDE
+ if [ ! -f /root/etc/kde3/kpersonalizerrc ]
+ then
+
+cat > /root/etc/kde3/kpersonalizerrc <<EOF
[General]
FirstLogin=false
EOF
- else
- echo "I'm not smart enough to disable kpersonalizer startup" >&2
- echo "Because kpersonalizerrc already exists" >&2
- fi
+
+ else
+ echo "I'm not smart enough to disable kpersonalizer startup" >&2
+ echo "Because kpersonalizerrc already exists" >&2
+ fi
fi
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/18hostname
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/18hostname 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/18hostname 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,27 +1,34 @@
-#! /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
+# hostname
+
+DESCRIPTION="Setting hostname..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
echo "$HOSTNAME" > /root/etc/hostname
-cat > /root/etc/hosts <<EOF
+
+cat > /root/etc/hosts << EOF
127.0.0.1 localhost
127.0.1.1 $HOSTNAME
@@ -32,7 +39,6 @@
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
ff02::3 ip6-allhosts
-
EOF
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,23 +1,27 @@
#!/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
+DESCRIPTION="Configuring X kludges..."
+
+. /scripts/live-functions
+
if [ -n "$XVIDEOMODE" ]
then
log_begin_msg "$DESCRIPTION"
@@ -27,7 +31,7 @@
mount -n -o bind /dev /root/dev
mount -n -o bind /etc /root/dev
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
set xserver-xorg/config/monitor/mode-list ${XVIDEOMODE}
set xserver-xorg/config/display/modes ${XVIDEOMODE}
EOF
Modified: dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/20xconfig 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/20xconfig 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,64 +1,80 @@
#!/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
+# xorg
+
+DESCRIPTION="Configuring X..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
-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
- exit 0
+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
+ exit 0
fi
mount -n -o bind /sys /root/sys
mount -n -o bind /proc /root/proc
mount -n -o bind /dev /root/dev
-if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]; then
- # xdebconfigurator
- chroot /root /usr/sbin/xdebconfigurator
+if [ -n "${XDEBCONF}" ] && [ -x /root/usr/sbin/xdebconfigurator ]
+then
+ # xdebconfigurator
+ chroot /root /usr/sbin/xdebconfigurator
fi
-if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
- chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+then
+
+chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
set xserver-xorg/autodetect_keyboard true
fset xserver-xorg/autodetect_keyboard seen true
EOF
+
else
- # d-i code not present, so:
- if [ -n "${KOPTIONS}" ]; then
- setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
- fi
- if [ -n "${KVARIANT}" ]; then
- setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
- fi
- if [ -n "${KMODEL}" ]; then
- setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
- fi
+ # d-i code not present, so:
+ if [ -n "${KOPTIONS}" ]
+ then
+ setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
+ fi
- chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+ if [ -n "${KVARIANT}" ]
+ then
+ setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
+ fi
+
+ if [ -n "${KMODEL}" ]
+ then
+ setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
+ fi
+
+chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
${setvariant}
${setmodel}
${setoptions}
EOF
+
fi
DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,34 +1,44 @@
#!/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
+# gnome-panel-data
+
+DESCRIPTION="Configuring gnome-panel-data..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
-if [ -x /root/usr/sbin/laptop-detect ]; then
- if chroot /root laptop-detect; then
- live-reconfigure /root gnome-panel-data
+if [ -x /root/usr/sbin/laptop-detect ]
+then
+ if chroot /root laptop-detect
+ then
+ live-reconfigure /root gnome-panel-data
fi
fi
panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-panel-data 2>/dev/null) || panel_version=""
-if [ -n "$panel_version" ]; then
- chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
+
+if [ -n "$panel_version" ]
+then
+ chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
fi
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/22screensaver
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/22screensaver 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/22screensaver 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,30 +1,38 @@
#!/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
+# screensaver
+
+DESCRIPTION="Configuring screensaver..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
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
- chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
- chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
+
+if [ -n "$gnome_screensaver_version" ]
+then
+ # Support legacy gconf value
+ chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
+ chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
fi
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,30 +1,36 @@
-#! /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
+# etc-modules
+
+DESCRIPTION="Preconfiguring /etc/modules..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
case "$DPKG_ARCH" in
-# load the right modules
-powerpc|ppc64)
- echo snd_powermac >> /root/etc/modules
- ;;
+ powerpc|ppc64)
+ # load the right modules
+ echo snd_powermac >> /root/etc/modules
+ ;;
esac
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/23networking
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/23networking 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/23networking 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,33 +1,40 @@
-#! /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
+# networking
+
+DESCRIPTION="Preconfiguring networking..."
+IFFILE="/root/etc/network/interfaces"
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
-if [ "${STATICIP}" = "frommedia" -a -e "$IFFILE" ] ; then
- # will use existent /etc/network/interfaces
- log_end_msg
- exit 0
+if [ "${STATICIP}" = "frommedia" ] && [ -e "$IFFILE" ]
+then
+ # will use existent /etc/network/interfaces
+ log_end_msg
+ exit 0
fi
-cat > "$IFFILE" <<EOF
+cat > "$IFFILE" << EOF
auto lo
iface lo inet loopback
@@ -36,14 +43,18 @@
udevtrigger
udevsettle
-if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]; then
- parsed=$(echo "${STATICIP}" | sed -e 's/:/ /g')
- for ifline in ${parsed}; do
- ifname="$(echo ${ifline} | cut -f1 -d ',')"
- ifaddress="$(echo ${ifline} | cut -f2 -d ',')"
- ifnetmask="$(echo ${ifline} | cut -f3 -d ',')"
- ifgateway="$(echo ${ifline} | cut -f4 -d ',')"
- cat >> "$IFFILE" <<EOF
+if [ -z "${NETBOOT}" ] && [ -n "${STATICIP}" ] && [ "${STATICIP}" != "frommedia" ]
+then
+ parsed=$(echo "${STATICIP}" | sed -e 's/:/ /g')
+
+ for ifline in ${parsed}
+ do
+ ifname="$(echo ${ifline} | cut -f1 -d ',')"
+ ifaddress="$(echo ${ifline} | cut -f2 -d ',')"
+ ifnetmask="$(echo ${ifline} | cut -f3 -d ',')"
+ ifgateway="$(echo ${ifline} | cut -f4 -d ',')"
+
+cat >> "$IFFILE" <<EOF
auto ${ifname}
iface ${ifname} inet static
address ${ifaddress}
@@ -51,39 +62,51 @@
gateway ${ifgateway}
EOF
- done
+
+ done
else
- if [ -z "${NETBOOT}" ]; then
- # default, dhcp assigned
- method="dhcp"
- else
- # make sure that the preconfigured interface would not get reassigned by dhcp
- # on startup by ifup script - otherwise our root fs might be disconnected!
- method="manual"
- fi
- # iterate the physical interfaces and add them to the interfaces list
- for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*; do
- [ -e $interface ] || continue
- i="$(basename $interface)"
- cat >> "$IFFILE" <<EOF
+ if [ -z "${NETBOOT}" ]
+ then
+ # default, dhcp assigned
+ method="dhcp"
+ else
+ # make sure that the preconfigured interface would not get reassigned by dhcp
+ # on startup by ifup script - otherwise our root fs might be disconnected!
+ method="manual"
+ fi
+
+ # iterate the physical interfaces and add them to the interfaces list
+ for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
+ do
+ [ -e $interface ] || continue
+ i="$(basename $interface)"
+
+cat >> "$IFFILE" <<EOF
auto $i
iface $i inet $method
EOF
- done
- if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ] ; then
- # create a resolv.conf if it is not present
- cp /netboot.config /root/var/log/netboot.config
- rc_search=$(cat netboot.config | awk '/domain/{print $3}')
- rc_server0=$(cat netboot.config | awk '/dns0/{print $5}')
- rc_server1=$(cat netboot.config | awk '/dns0/{print $8}')
- rc_server0="nameserver ${rc_server0}"
- if [ "${rc_server1}" = "0.0.0.0" ]; then
- rc_server1=""
- else
- rc_server1="nameserver ${rc_server1}"
- fi
- cat > /root/etc/resolv.conf <<EOF
+
+ done
+
+ if [ ! -f /root/etc/resolv.conf ] && [ -f /netboot.config ]
+ then
+ # create a resolv.conf if it is not present
+ cp /netboot.config /root/var/log/netboot.config
+
+ rc_search=$(cat netboot.config | awk '/domain/{print $3}')
+ rc_server0=$(cat netboot.config | awk '/dns0/{print $5}')
+ rc_server1=$(cat netboot.config | awk '/dns0/{print $8}')
+ rc_server0="nameserver ${rc_server0}"
+
+ if [ "${rc_server1}" = "0.0.0.0" ]
+ then
+ rc_server1=""
+ else
+ rc_server1="nameserver ${rc_server1}"
+ fi
+
+cat > /root/etc/resolv.conf <<EOF
# /etc/resolv.conf
# Autogenerated by casper
search ${rc_search}
@@ -91,8 +114,9 @@
${rc_server0}
${rc_server1}
EOF
- cat /root/etc/resolv.conf >> /root/var/log/netboot.config
- fi
+
+ cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+ fi
fi
#for i in eth0 eth1 eth2 ath0 wlan0; do
Modified: dists/trunk/live-initramfs/scripts/live-bottom/24preseed
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/24preseed 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/24preseed 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,35 +1,45 @@
-#! /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
+# preseed
+
+DESCRIPTION="Loading preseed file..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
-if [ -f "/root/${LOCATION}" ]; then
- chroot /root debconf-set-selections < "/root/${LOCATION}"
+if [ -f "/root/${LOCATION}" ]
+then
+ chroot /root debconf-set-selections < "/root/${LOCATION}"
fi
-if [ -n "${PRESEEDS}" ]; then
- for preseed in ${PRESEEDS}; do
- question="${preseed%%=*}"
- value="${preseed#*=}"
- live-preseed /root "${question}" "${value}"
- done
+if [ -n "${PRESEEDS}" ]
+then
+ for preseed in ${PRESEEDS}
+ do
+ question="${preseed%%=*}"
+ value="${preseed#*=}"
+
+ live-preseed /root "${question}" "${value}"
+ done
fi
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/25configure_init 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/25configure_init 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,70 +1,94 @@
#!/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
+# configure-init
+
+DESCRIPTION="Setting up init..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
# Arrange for shells on virtual consoles, rather than login prompts
-if [ -n "$USERNAME" ]; then
- if [ ! -z "${CASPERGETTY}" ]; then
- if echo "${DEFCONSOLE}" | grep -qs ttyS; then
- # AUTOMATIC SERIAL CONSOLE #
- PORT=$(echo "${DEFCONSOLE}" | sed -e 's%,.*%%')
- SPEED=$(echo "${DEFCONSOLE}" | sed -e 's%ttyS[0-9]\+,%%' -e's%\([0-9]\+\).*%\1%')
+if [ -n "$USERNAME" ]
+then
+ if [ -n "${CASPERGETTY}" ]
+ then
+ if echo "${DEFCONSOLE}" | grep -qs ttyS
+ then
+ # AUTOMATIC SERIAL CONSOLE #
+ PORT=$(echo "${DEFCONSOLE}" | sed -e 's%,.*%%')
+ SPEED=$(echo "${DEFCONSOLE}" | sed -e 's%ttyS[0-9]\+,%%' -e's%\([0-9]\+\).*%\1%')
- if ! ( sed -n -e'/^[^#]/p' /root/etc/inittab | grep -qs ":respawn:/sbin/getty.*${PORT}" ) ; then
- IDs="A B C D E F G H I J K L M N O P Q R S T Q U V V X Y Z 0 1 2 3 4 5 6 7 8 9"
- for ID1 in $IDs; do
- for ID2 in $IDs; do
- ID="${ID1}${ID2}"
- if ! grep "^${ID}:" /etc/inittab ; then
- #make sure it is not already in use
- break 2
+ if ! ( sed -n -e'/^[^#]/p' /root/etc/inittab | grep -qs ":respawn:/sbin/getty.*${PORT}" )
+ then
+ IDs="A B C D E F G H I J K L M N O P Q R S T Q U V V X Y Z 0 1 2 3 4 5 6 7 8 9"
+
+ for ID1 in $IDs
+ do
+ for ID2 in $IDs
+ do
+ ID="${ID1}${ID2}"
+
+ if ! grep "^${ID}:" /etc/inittab
+ then
+ #make sure it is not already in use
+ break 2
+ fi
+ done
+ done
+
+ echo "${ID}:2345:respawn:/sbin/live-getty -L ${PORT} ${SPEED} vt100" \
+ >> /root/etc/inittab
fi
- done
- done
- echo "${ID}:2345:respawn:/sbin/live-getty -L ${PORT} ${SPEED} vt100" \
- >>/root/etc/inittab
- fi
+ fi
+
+ if [ -f /root/etc/inittab ]
+ then
+ sed -i -e'/^[^#]/s%respawn:/sbin/getty%respawn:/sbin/live-getty%' /root/etc/inittab
+ fi
+ else
+ if [ -f /root/etc/inittab ]
+ then
+ sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f $USERNAME </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
+ fi
+
+ if [ "/root/etc/event.d/tty*" != "$(echo /root/etc/event.d/tty*)" ]
+ 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
+ fi
fi
- if [ -f /root/etc/inittab ]; then
- sed -i -e'/^[^#]/s%respawn:/sbin/getty%respawn:/sbin/live-getty%' /root/etc/inittab
- fi
- else
- if [ -f /root/etc/inittab ]; then
- sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f $USERNAME </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
- fi
- if [ "/root/etc/event.d/tty*" != "$(echo /root/etc/event.d/tty*)" ]; 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
- fi
- fi
fi
# This has the nice side effect of the cron.{daily,weekly,monthly} jobs in
# /etc/crontab remaining disabled, yet also not run by anacron
-if [ -x /root/etc/init.d/anacron ]; then
- for f in /root/etc/rc?.d/S??anacron; do
- mv ${f} ${f%/*}/K00anacron
- done
+if [ -x /root/etc/init.d/anacron ]
+then
+ for f in /root/etc/rc?.d/S??anacron
+ do
+ mv ${f} ${f%/*}/K00anacron
+ done
fi
# No point, really
@@ -75,8 +99,9 @@
# Disable readahead since it doesn't play well with squashfs + unionfs
# use chmod instead of mv to not trigger unionfs bugs.
-if [ -e /root/sbin/readahead-list ]; then
- chmod -x /root/sbin/readahead-list
+if [ -e /root/sbin/readahead-list ]
+then
+ chmod -x /root/sbin/readahead-list
fi
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/30accessibility
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/30accessibility 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/30accessibility 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,37 +1,47 @@
#!/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
+# accessibility
+
+DESCRIPTION="Configuring accessibility options..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
gconf_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gconf2 2>/dev/null) || gconf_version=""
-gct() {
- if [ "$gconf_version" ]; then
- chroot /root sudo -u "$USERNAME" gconftool-2 "$@"
- fi
+gct ()
+{
+ if [ "$gconf_version" ]
+ then
+ chroot /root sudo -u "$USERNAME" gconftool-2 "$@"
+ fi
}
-kderc_addtoprefixes() {
- if [ -e "/root/etc/kderc" ]; then
- sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /root/etc/kderc
- fi
+kderc_addtoprefixes ()
+{
+ if [ -e "/root/etc/kderc" ]
+ then
+ sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /root/etc/kderc
+ fi
}
case $ACCESS in
Modified: dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,23 +1,29 @@
#!/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
+# disable_update_notifier
+
+DESCRIPTION="Disabling update-notifier..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
# For GNOME, we divert away apt-check to avoid a regular 'apt-get update'
Modified: dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,23 +1,29 @@
#!/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
+# disable hibernation
+
+DESCRIPTION="Configuring power management..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
Modified: dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,23 +1,29 @@
-#! /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
+# disable kwallet
+
+DESCRIPTION="Disabling kwallet..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
rm -f /root/usr/share/services/kded/kwalletd.desktop
Modified: dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,32 +1,39 @@
-#! /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
+# fx language selector
+
+DESCRIPTION="Fixing language selector..."
+
+. /scripts/live-functions
+
log_begin_msg "$DESCRIPTION"
-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
-
+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
fi
-if [ -x /root/usr/bin/fontconfig-voodoo ]; then
- chroot /root fontconfig-voodoo --auto --quiet || true
+if [ -x /root/usr/bin/fontconfig-voodoo ]
+then
+ chroot /root fontconfig-voodoo --auto --quiet || true
fi
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,23 +1,29 @@
-#! /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
+# install driver updates
+
+DESCRIPTION="Installing driver updates..."
+
+. /scripts/live-functions
+
if [ ! -d /tmp/driver-updates ]; then
exit 0
fi
Modified: dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom 2007-05-11 10:22:45 UTC (rev 1454)
+++ dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom 2007-05-11 10:45:35 UTC (rev 1455)
@@ -1,23 +1,29 @@
-#! /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
+# apt-cdrom
+
+DESCRIPTION="Adding APT-CDROM source..."
+
+. /scripts/live-functions
+
mkdir -p /root/cdrom
mount -n -o bind /cdrom /root/cdrom
chroot /root apt-cdrom -m add
More information about the Debian-live-changes
mailing list