[Debian-live-changes] r1337 - in dists/trunk/live-initramfs: conf
debian doc hooks manpages scripts scripts/live-bottom
Daniel Baumann
daniel at alioth.debian.org
Mon May 7 07:29:42 UTC 2007
Author: daniel
Date: 2007-05-07 07:29:41 +0000 (Mon, 07 May 2007)
New Revision: 1337
Modified:
dists/trunk/live-initramfs/conf/live.conf
dists/trunk/live-initramfs/debian/changelog
dists/trunk/live-initramfs/debian/init
dists/trunk/live-initramfs/doc/ChangeLog
dists/trunk/live-initramfs/hooks/live
dists/trunk/live-initramfs/manpages/live-initramfs.7
dists/trunk/live-initramfs/scripts/live
dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf
dists/trunk/live-initramfs/scripts/live-bottom/10adduser
dists/trunk/live-initramfs/scripts/live-bottom/14locales
dists/trunk/live-initramfs/scripts/live-bottom/15autologin
dists/trunk/live-initramfs/scripts/live-bottom/19keyboard
dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
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-helpers
Log:
Modified: dists/trunk/live-initramfs/conf/live.conf
===================================================================
--- dists/trunk/live-initramfs/conf/live.conf 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/conf/live.conf 2007-05-07 07:29:41 UTC (rev 1337)
@@ -4,6 +4,7 @@
USERNAME="user"
USERFULLNAME="Live session user"
+
HOSTNAME="debian"
export BUILD_SYSTEM USERNAME USERFULLNAME HOSTNAME
Modified: dists/trunk/live-initramfs/debian/changelog
===================================================================
--- dists/trunk/live-initramfs/debian/changelog 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/debian/changelog 2007-05-07 07:29:41 UTC (rev 1337)
@@ -1,9 +1,3 @@
-live-initramfs (1.87.3-1) UNRELEASED; urgency=low
-
- * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org> Mon, 14 May 2007 00:00:00 +0200
-
live-initramfs (1.87.2-1) unstable; urgency=low
* New upstream release.
Modified: dists/trunk/live-initramfs/debian/init
===================================================================
--- dists/trunk/live-initramfs/debian/init 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/debian/init 2007-05-07 07:29:41 UTC (rev 1337)
@@ -72,22 +72,22 @@
done
for x in $(cat /proc/cmdline); do
- case $x in
+ case $x in
quickreboot)
- QUICKREBOOT="Yes"
- ;;
+ QUICKREBOOT="Yes"
+ ;;
esac
done
if [ -z ${QUICKREBOOT} ]; then
- eject -p -m /live_media >/dev/null 2>&1
+ eject -p -m /live_media >/dev/null 2>&1
# XXX - i18n
echo "Please remove the disc and close the tray (if any) then press ENTER: "
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)"
- /sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
+ /sbin/usplash_write "TIMEOUT 86400"
+ /sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)"
+ /sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
fi
read x < /dev/console
Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/doc/ChangeLog 2007-05-07 07:29:41 UTC (rev 1337)
@@ -1,36 +1,58 @@
2007-05-06 Daniel Baumann <daniel at debian.org>
- * Merging patches from casper 1.81+debian-4.
+ * Merging patches from casper 1.81+debian-4, see ChangeLog.casper.
+ * conf/live.conf:
+ - Renamed HOST to HOSTNAME.
+ * debian/init:
+ - Added quickreboot.
+ - Renamed /cdrom to /live_media.
* doc/ChangeLog.casper:
- Added missing debian uploads.
- * debian/init:
- - Added patch to support quickreboot.
* manpages/live-initramfs.7:
- - Added patch to add missing and new stuff.
- * conf/live.conf, scripts/live, scripts/live-bottom/18hostname:
- - Added patch to rename $HOST to $HOSTNAME.
+ - Updated.
* hooks/live:
- - Added patch to allow custom keymap when using encryption.
- - Added patch to make ubuntu specific calls conditional.
- - Added patch to read configuration file earlier.
+ - Reading live.conf earlier.
+ - Making some udev copies conditional for ubuntu.
+ - Allowing local keymap when using encrypted filesystems.
* scripts/live:
- - Added patch to support encrypted filesystem images.
- - Added patch to support multiple filesystem images.
- * scripts/live-functions:
- - Added patch to really export variables from live.vars.
- * scripts/live-helpers:
- - Added patch to support encrypted filesystem images.
- - Added patch fo add function for loading keymaps.
+ - Renamed HOST to HOSTNAME.
+ - Renamed /cdrom to /live_media.
+ - Parsing commandline in one central place now.
+ - Added support for encrypted filesytem images.
+ - Added support for multiple filesystem images.
* scripts/live-bottom/01integrity_check:
- - Added patch to change /cdrom to more generic /live_media.
- * scripts/live-bottom/01etch_live_conf:
- - Added patch to add script updating live.conf file.
+ - Renamed /cdrom to /live_media.
+ * scripts/live-bottom/02etc_live_conf:
+ - Added.
* scripts/live-bottom/05mountpoints:
- - Added patch to change /cdrom to more generic /live_media.
+ - Renamed /cdrom to /live_media.
* scripts/live-bottom/10adduser:
- - Added patch to set default password.
- - Added patch to make disabling of screensaver conditional to
- ubuntu.
+ - Changed default password.
+ - Disabled xscreensaver locking.
+ * scripts/live-bottom/14locales:
+ - Added handling of locale bootparameter.
+ * scripts/live-bottom/15autologin:
+ - Added workaround for using gdm default config.
+ * scripts/live-bottom/18hostname:
+ - Renamed HOST to HOSTNAME.
+ * scripts/live-bottom/19keyboard:
+ - Added handling of keyboard bootparameter.
+ * scripts/live-bottom/20xconfig:
+ - Added handling of keyboard bootparameter.
+ - Added handling of locale bootparameter.
+ * scripts/live-bottom/23networking:
+ - Disabled loop over fixed network devices.
+ * scripts/live-bottom/24preseed:
+ - Added handling of multiple preseeding files.
+ - Removed locale handling.
+ * scripts/live-bottom/25configure_init:
+ - Added handling of serial ttys.
+ * scripts/live-bottom/30accessibility:
+ - Removed extra parsing of commandline.
+ * scripts/live-functions:
+ - Added function to really export variables.
+ * scripts/live-helpers:
+ - Added support for encrypted filesytem images.
2007-05-06 Daniel Baumann <daniel at debian.org>
Modified: dists/trunk/live-initramfs/hooks/live
===================================================================
--- dists/trunk/live-initramfs/hooks/live 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/hooks/live 2007-05-07 07:29:41 UTC (rev 1337)
@@ -19,6 +19,7 @@
. /usr/share/initramfs-tools/hook-functions
if [ -e /etc/live.conf ]; then
+ . /etc/live.conf
mkdir -p ${DESTDIR}/etc
cp /etc/live.conf ${DESTDIR}/etc
fi
@@ -34,14 +35,17 @@
copy_exec /usr/share/live-initramfs/live-preseed /bin
if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
- mkdir -p ${DESTDIR}/lib/udev
- copy_exec /lib/udev/cdrom_id /lib/udev
- copy_exec /lib/udev/vol_id /lib/udev
- copy_exec /lib/udev/path_id /lib/udev
- copy_exec /usr/bin/udevinfo /bin
- copy_exec /usr/bin/eject /bin
+ mkdir -p ${DESTDIR}/lib/udev
+ copy_exec /lib/udev/cdrom_id /lib/udev
+ copy_exec /lib/udev/vol_id /lib/udev
+ copy_exec /lib/udev/path_id /lib/udev
fi
+copy_exec /usr/bin/udevinfo /bin
+#copy_exec /sbin/udevtrigger /sbin
+#copy_exec /sbin/udevsettle /sbin
+copy_exec /usr/bin/eject /bin
+
# cifs boot
if [ -x /sbin/mount.cifs ]; then
copy_exec /sbin/mount.cifs /sbin
@@ -73,8 +77,8 @@
# allow to load custom keymap for using encryption
if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]; then
- copy_exec /bin/loadkeys /bin
- cp /etc/console/boottime.kmap.gz $DESTDIR/etc/
+ copy_exec /bin/loadkeys /bin
+ cp /etc/console/boottime.kmap.gz $DESTDIR/etc/
fi
cp /usr/share/initramfs-tools/scripts/live-functions $DESTDIR/scripts
Modified: dists/trunk/live-initramfs/manpages/live-initramfs.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.7 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.7 2007-05-07 07:29:41 UTC (rev 1337)
@@ -20,9 +20,6 @@
This changes the auto-login on virtual terminals to use the (experimental) casper-getty code.
With this option set the standard kernel argument "console=" is parsed and if a serial console is specified then casper-getty is used to autologin on the serial console.
.TP
-.B xdebconf
-uses xdebconfigurator, if present on the rootfs, to configure X instead of the standard procedure (experimental).
-.TP
.BI "console=" TTY "," SPEED
Set the default console to be used with the "casper-getty" option.
Example: "console=ttyS0,115200"
@@ -55,8 +52,7 @@
Set the timeout in seconds for the device specified by "live-media=" to become ready before giving up.
.TP
.BI "locale=" LOCALE " | debian-installer/locale=" LOCALE
-Configure the running locale as specified, if not present the live-media rootfs configured locale will be used and if also this one misses casper behave as "locale=en_US.UTF-8" was specified. If only 2 lowercase letter are specified (like "it"), the "maybe wanted" locale is generated (like it:IT.UTF-8), in this case if also "keyb=" is unspecified is set with those 2 lowercase letters (keyb=it).
-Beside that facility, only UTF8 locales are supported by casper.
+Configure the running locale as specified, if not present the live-media rootfs configured locale will be used and if also this one misses casper behave as "locale=en_US.UTF-8" was specified. If only 2 lowercase letter are specified (like "it"), the "maybe wanted" locale is generated (like it:IT.UTF-8), in this case if also "keyb=" is unspecified is set with those 2 lowercase letters (keyb=it). Beside that facility, only UTF8 locales are supported by casper.
.TP
.BI "module=" NAME
Instead of using the default optional file "order.lst" (see below) another file could be specified without the extension ".lst"; it should be placed on /casper/ directory of the live medium.
@@ -87,10 +83,15 @@
.TP
.BI "package/question=" VALUE
All debian installed packages could be preseeded from command-line that way, beware of blanks spaces, they will interfere with parsing, use a preseed file in this case.
+.TP
+.B xdebconf
+uses xdebconfigurator, if present on the rootfs, to configure X instead of the standard procedure (experimental).
+.TP
.SH FILES
.B /etc/live.conf
some variables can be configured via this config file.
+.TP
.B /casper/order.lst
This optional file contains a list of white-space or carriage-return-separated file names corresponding to disk images in the /casper directory. If this file exists, only images listed here will be merged into the root unionfs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the unionfs, and the last file in this list will be on the "top" of the unionfs, directly below /cow. Without this file, any images in the /casper directory are loaded in alphanumeric order.
Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live 2007-05-07 07:29:41 UTC (rev 1337)
@@ -7,9 +7,9 @@
echo "/root/lib" >> /etc/ld.so.conf
echo "/root/usr/lib" >> /etc/ld.so.conf
-mountpoint=/live_media
+mountpoint=/live_media.
-root_persistence="liver-rw"
+root_persistence="live-rw"
home_persistence="home-rw"
root_snapshot_label="live-sn"
home_snapshot_label="home-sn"
@@ -36,75 +36,74 @@
# looking for casper specifics options as kernel parameters
for x in $(cat /proc/cmdline); do
case $x in
- userfullname=*)
- export USERFULLNAME=${x#userfullname=}
- export CASPERCONF="changed"
- ;;
- hostname=*)
- export HOSTNAME=${x#hostname=}
- export CASPERCONF="changed"
- ;;
- username=*)
- export USERNAME=${x#username=}
- export CASPERCONF="changed"
- ;;
- netboot*)
- export NETBOOT=${x#netboot=} ;;
- access=*)
- export ACCESS=${x#access=} ;;
- xdebconf)
- export XDEBCONF="Yes" ;;
- toram)
- export TORAM="Yes" ;;
- todisk=*)
- export TODISK=${x#todisk=} ;;
- showmounts)
- export SHOWMOUNTS="Yes" ;;
- persistent)
- export PERSISTENT="Yes" ;;
- nopersistent)
- export PERSISTENT="" ;;
- ip*)
- STATICIP=${x#ip=}
- if [ "${STATICIP}" = "" ]; then
- STATICIP="frommedia"
- fi
- export STATICIP
- ;;
- live-getty)
- export CASPERGETTY=1 ;;
- bootfrom=*|live-media=*)
- export LIVEMEDIA=${x#*=} ;;
- live-media-encryption=*|encryption=*)
- export LIVEMEDIA_ENCRYPTION=${x#*=} ;;
- live-media-timeout=*)
- export LIVEMEDIA_TIMEOUT=${x#live-media-timeout=} ;;
- live-media-offset=*)
- export LIVEMEDIA_OFFSET=${x#live-media-offset=} ;;
- locale=*|debian-installer/locale=*)
- export LOCALE=${x#*=} ;;
- keyb=*|kbd-chooser/method=*)
- export KBD=${x#*=} ;;
- klayout=*|console-setup/layoutcode=*)
- export KLAYOUT=${x#*=} ;;
- koptions=*)
- export KOPTIONS=${x#koptions=} ;;
- kvariant=*|console-setup/variantcode=*)
- export KVARIANT=${x#*=} ;;
- kmodel=*|console-setup/modelcode=*)
- export KMODEL=${x#*=} ;;
- module=*)
- export MODULE=${x#module=} ;;
- preseed/file=*|file=*)
- export LOCATION="${x#*=}" ;;
- */*=*)
- question="${x%%=*}"
- value="${x#*=}"
- PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
- ;;
- console=*)
- export DEFCONSOLE="${x#*=}" ;;
- esac
+ userfullname=*)
+ export USERFULLNAME=${x#userfullname=}
+ export CASPERCONF="changed"
+ ;;
+ hostname=*)
+ export HOSTNAME=${x#hostname=}
+ export CASPERCONF="changed"
+ ;;
+ username=*)
+ export USERNAME=${x#username=}
+ export CASPERCONF="changed"
+ ;;
+ netboot*)
+ export NETBOOT=${x#netboot=} ;;
+ access=*)
+ export ACCESS=${x#access=} ;;
+ xdebconf)
+ export XDEBCONF="Yes" ;;
+ toram)
+ export TORAM="Yes" ;;
+ todisk=*)
+ export TODISK=${x#todisk=} ;;
+ showmounts)
+ export SHOWMOUNTS="Yes" ;;
+ persistent)
+ export PERSISTENT="Yes" ;;
+ nopersistent)
+ export PERSISTENT="" ;;
+ ip*)
+ STATICIP=${x#ip=}
+ if [ "${STATICIP}" == "" ]; then
+ STATICIP="frommedia"
+ fi
+ export STATICIP ;;
+ casper-getty)
+ export CASPERGETTY=1 ;;
+ bootfrom=*|live-media=*)
+ export LIVEMEDIA=${x#*=} ;;
+ live-media-encryption=*|encryption=*)
+ export LIVEMEDIA_ENCRYPTION=${x#*=} ;;
+ live-media-timeout=*)
+ export LIVEMEDIA_TIMEOUT=${x#live-media-timeout=} ;;
+ live-media-offset=*)
+ export LIVEMEDIA_OFFSET=${x#live-media-offset=} ;;
+ locale=*|debian-installer/locale=*)
+ export LOCALE=${x#*=} ;;
+ keyb=*|kbd-chooser/method=*)
+ export KBD=${x#*=} ;;
+ klayout=*|console-setup/layoutcode=*)
+ export KLAYOUT=${x#*=} ;;
+ koptions=*)
+ export KOPTIONS=${x#koptions=} ;;
+ kvariant=*|console-setup/variantcode=*)
+ export KVARIANT=${x#*=} ;;
+ kmodel=*|console-setup/modelcode=*)
+ export KMODEL=${x#*=} ;;
+ module=*)
+ export MODULE=${x#module=} ;;
+ preseed/file=*|file=*)
+ export LOCATION="${x#*=}" ;;
+ */*=*)
+ question="${x%%=*}"
+ value="${x#*=}"
+ PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
+ ;;
+ console=*)
+ export DEFCONSOLE="${x#*=}" ;;
+ esac
done
# sort of compatibility with netboot.h from linux docs
@@ -119,7 +118,7 @@
fi
if [ -z "${MODULE}" ]; then
- MODULE=order
+ MODULE=order
fi
}
@@ -138,7 +137,7 @@
get_backing_device() {
case "$1" in
*.squashfs|*.ext2)
- echo $(setup_loop "$1" "loop" "/sys/block/loop*" '0' "${LIVEMEDIA_ENCRYPTION}")
+ echo $(setup_loop "$1" "loop" "/sys/block/loop*" '0' "${LIVEMEDIA_ENCRYPTION}")
;;
*.dir)
echo "directory"
@@ -448,11 +447,12 @@
fstype=$(get_fstype "${backdev}")
if [ "${fstype}" = "unknown" ]; then
panic "Unknown file system type on ${backdev} (${image})"
- fi
+ fi
mkdir -p "${croot}/${imagename}"
mount -t "${fstype}" -o ro "${backdev}" "${croot}/${imagename}" || panic "Can not mount $backdev ($image) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
fi
done
+
rofsstring=${rofsstring%:}
mkdir -p /cow
@@ -502,7 +502,7 @@
done
fi
- # shows cow fs on /cow for use by casper-snapshot
+ # shows cow fs on /cow for use by live-snapshot
mkdir -p "${rootmnt}/cow"
mount -o bind /cow "${rootmnt}/cow"
}
@@ -516,8 +516,8 @@
fi
if [ -n "${LIVEMEDIA_OFFSET}" ]; then
- loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVEMEDIA_OFFSET}" '')
- devname="${loopdevname}"
+ loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVEMEDIA_OFFSET}" '')
+ devname="${loopdevname}"
fi
fstype=$(get_fstype "${devname}")
Modified: dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf 2007-05-07 07:29:41 UTC (rev 1337)
@@ -13,9 +13,9 @@
case $1 in
# get pre-requisites
prereqs)
- prereqs
- exit 0
- ;;
+ prereqs
+ exit 0
+ ;;
esac
log_begin_msg "$DESCRIPTION"
@@ -24,8 +24,8 @@
if [ ! -z "${CASPERCONF}" ]; then
# Updating live.conf
sed -i -e 's/\(USERNAME="\).*"/\1'"${USERNAME}"'"/g' \
- -e 's/\(USERFULLNAME="\).*"/\1'"${USERFULLNAME}"'"/g' \
- -e 's/\(HOSTNAME="\).*"/\1'"${HOSTNAME}"'"/g' /etc/live.conf
+ -e 's/\(USERFULLNAME="\).*"/\1'"${USERFULLNAME}"'"/g' \
+ -e 's/\(HOSTNAME="\).*"/\1'"${HOSTNAME}"'"/g' /etc/live.conf
fi
cp -p /etc/live.conf /root/etc/live.conf
Modified: dists/trunk/live-initramfs/scripts/live-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/10adduser 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser 2007-05-07 07:29:41 UTC (rev 1337)
@@ -30,12 +30,18 @@
chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
set passwd/root-password-crypted *
set passwd/user-password-crypted ${user_crypted}
-set passwd/user-fullname $USERFULLNAME
+set passwd/user-fullname $USERFULLNAME
set passwd/username $USERNAME
set passwd/user-uid 999
EOF
-chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
+if [ "${BUILD_SYSTEM}" = "Debian" ]; then
+ chroot /root /usr/bin/env -i HOME="/root" \
+ TERM="${TERM}" PATH="/usr/sbin:/usr/bin:/sbin:/bin" \
+ /usr/lib/user-setup/user-setup-apply > /dev/null
+else
+ chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
+fi
# Clear out debconf database again to avoid confusing ubiquity later.
chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
@@ -48,7 +54,7 @@
if [ -f /root/etc/sudoers ]; then
if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
- # XXX - awful hack to stop xscreensaver locking the screen (#7150)
+ # XXX - awful hack to stop xscreensaver locking the screen (#7150)
echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop; do
@@ -58,7 +64,7 @@
fi
done
else # We are in debian :-)
- echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
+ echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
fi
fi
Modified: dists/trunk/live-initramfs/scripts/live-bottom/14locales
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/14locales 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live-bottom/14locales 2007-05-07 07:29:41 UTC (rev 1337)
@@ -34,18 +34,10 @@
fi
# commandline
-for x in $(cat /proc/cmdline); do
- case $x in
- debian-installer/locale=*)
- locale=${x#debian-installer/locale=}
- set_locale="true"
- ;;
- locale=*)
- locale=${x#locale=}
- set_locale="true"
- ;;
- esac
-done
+if [ ! -z "${LOCALE}" ]; then
+ locale="${LOCALE}"
+ set_locale="true"
+fi
if [ -z "${locale}" ]; then
# Set a default one
@@ -54,10 +46,36 @@
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
+ 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)
- printf 'LANG="%s"\n' "${LANG}" >> "${grep_file}"
- printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
- chroot /root /usr/sbin/locale-gen "${LANG}"
+
+ if [ -z "${LANG}" ]; then
+ log_warning_message "Locale ${locale} is unsupported."
+ locale="en_US.UTF-8"
+ LANG="${locale}"
+ fi
+
+ really_export LANG
+
+ if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+ printf 'LANG="%s"\n' "${LANG}" > "${grep_file}"
+ chroot /root /usr/sbin/locale-gen "${LANG}"
+ casper-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-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live-bottom/15autologin 2007-05-07 07:29:41 UTC (rev 1337)
@@ -27,6 +27,11 @@
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/" \
Modified: dists/trunk/live-initramfs/scripts/live-bottom/19keyboard
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/19keyboard 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live-bottom/19keyboard 2007-05-07 07:29:41 UTC (rev 1337)
@@ -20,28 +20,30 @@
log_begin_msg "$DESCRIPTION"
-kbd=us
+kbd=
cslayout=
csvariant=
csmodel=
-for x in $(cat /proc/cmdline); do
- case $x in
- kbd-chooser/method=*)
- kbd=${x#kbd-chooser/method=}
- ;;
- console-setup/layoutcode=*)
- cslayout=${x#console-setup/layoutcode=}
- ;;
- console-setup/variantcode=*)
- csvariant=${x#console-setup/variantcode=}
- ;;
- console-setup/modelcode=*)
- csmodel=${x#console-setup/modelcode=}
- ;;
- esac
-done
+# commandline
+if [ -n "${KBD}" ]; then
+ kbd="${KBD}"
+else
+ kbd=us
+fi
+really_export kbd
+
+if [ -n "${KLAYOUT}" ]; then
+ cslayout="${KLAYOUT}"
+fi
+if [ -n "${KVARIANT}" ]; then
+ csvariant="${KVARIANT}"
+fi
+if [ -n "${KMODEL}" ]; then
+ csmodel="${KMODEL}"
+fi
+
if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
if [ "$cslayout" ]; then
chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"$cslayout\"/" \
@@ -65,6 +67,6 @@
fi
else
chroot /root /usr/sbin/install-keymap $kbd
- live-preseed /root debian-installer/keymap "$kbd"
+ live-preseed /root kbd-chooser/method "$kbd"
fi
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/20xconfig 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live-bottom/20xconfig 2007-05-07 07:29:41 UTC (rev 1337)
@@ -26,19 +26,6 @@
exit 0
fi
-locale=en_US.UTF-8
-
-for x in $(cat /proc/cmdline); do
- case $x in
- debian-installer/locale=*)
- locale=${x#debian-installer/locale=}
- ;;
- locale=*)
- locale=${x#locale=}
- ;;
- esac
-done
-
mount -n -o bind /sys /root/sys
mount -n -o bind /proc /root/proc
mount -n -o bind /dev /root/dev
@@ -48,12 +35,33 @@
chroot /root /usr/sbin/xdebconfigurator
fi
+if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+ chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
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
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 | sed -e 's, .*,,' -e q) live-reconfigure /root xserver-xorg
+ chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
+set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
+${setvariant}
+${setmodel}
+${setoptions}
+EOF
+fi
+
+DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 casper-reconfigure /root xserver-xorg
umount /root/sys
umount /root/proc
umount /root/dev
Modified: dists/trunk/live-initramfs/scripts/live-bottom/23networking
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/23networking 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live-bottom/23networking 2007-05-07 07:29:41 UTC (rev 1337)
@@ -95,13 +95,13 @@
fi
fi
-for i in eth0 eth1 eth2 ath0 wlan0; do
- grep -q "iface $i" $IFFILE && continue
- cat >> "$IFFILE" <<EOF
-auto $i
-iface $i inet dhcp
+#for i in eth0 eth1 eth2 ath0 wlan0; do
+# grep -q "iface $i" $IFFILE && continue
+# cat >> "$IFFILE" <<EOF
+#auto $i
+#iface $i inet dhcp
+#
+#EOF
+#done
-EOF
-done
-
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-bottom/24preseed
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/24preseed 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live-bottom/24preseed 2007-05-07 07:29:41 UTC (rev 1337)
@@ -20,29 +20,16 @@
log_begin_msg "$DESCRIPTION"
-location=
-for x in $(cat /proc/cmdline); do
- case $x in
- preseed/file=*)
- location="${x#preseed/file=}"
- ;;
- file=*)
- location="${x#file=}"
- ;;
- */*=*)
- question="${x%%=*}"
- value="${x#*=}"
- live-preseed /root "$question" "$value"
- ;;
- locale=*)
- value="${x#*=}"
- live-preseed /root debian-installer/locale "$value"
- ;;
- esac
-done
+if [ -f "/root/${LOCATION}" ]; then
+ chroot /root debconf-set-selections < "/root/${LOCATION}"
+fi
-if [ "$location" ]; then
- chroot /root debconf-set-selections < "/root$location"
+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-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live-bottom/25configure_init 2007-05-07 07:29:41 UTC (rev 1337)
@@ -23,14 +23,40 @@
# Arrange for shells on virtual consoles, rather than login prompts
if [ -n "$USERNAME" ]; then
- 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
+ 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 ! ( 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
+ 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 [ "/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|^exec.*|exec /bin/login -f $USERNAME </dev/$(basename $f) > /dev/$(basename $f) 2>\&1|" $f
- done
- fi
fi
# This has the nice side effect of the cron.{daily,weekly,monthly} jobs in
Modified: dists/trunk/live-initramfs/scripts/live-bottom/30accessibility
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/30accessibility 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live-bottom/30accessibility 2007-05-07 07:29:41 UTC (rev 1337)
@@ -34,73 +34,71 @@
fi
}
-for x in $(cat /proc/cmdline); do
- case $x in
- # Lesser Visual Impairment
- access=v1)
- gct -s -t string /desktop/gnome/interface/gtk_theme HighContrastLargePrint
- gct -s -t string /desktop/gnome/interface/icon_theme HighContrast
- gct -s -t string /desktop/gnome/interface/monospace_font_name "monospace 18"
- gct -s -t string /desktop/gnome/interface/font_name "sans 18"
- gct -s -t string /apps/metacity/general/theme Atlanta
- gct -s -t string /desktop/gnome/background/picture_filename ""
- gct -s -t string /desktop/gnome/background/picture_options none
- gct -s -t string /desktop/gnome/background/primary_color \#666666
- gct -s -t string /desktop/gnome/background/secondary_color \#7F7F7F
- gct -s -t string /desktop/gnome/background/color_shading_type solid
- gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
- gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
+case $ACCESS in
+ # Lesser Visual Impairment
+ access=v1)
+ gct -s -t string /desktop/gnome/interface/gtk_theme HighContrastLargePrint
+ gct -s -t string /desktop/gnome/interface/icon_theme HighContrast
+ gct -s -t string /desktop/gnome/interface/monospace_font_name "monospace 18"
+ gct -s -t string /desktop/gnome/interface/font_name "sans 18"
+ gct -s -t string /apps/metacity/general/theme Atlanta
+ gct -s -t string /desktop/gnome/background/picture_filename ""
+ gct -s -t string /desktop/gnome/background/picture_options none
+ gct -s -t string /desktop/gnome/background/primary_color \#666666
+ gct -s -t string /desktop/gnome/background/secondary_color \#7F7F7F
+ gct -s -t string /desktop/gnome/background/color_shading_type solid
+ gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
+ gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
- kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
- if [ -d /root/usr/share/xubuntu-default-settings/accessibility ]; then
- cp -a /root/usr/share/xubuntu-default-settings/accessibility/* /root/etc/xdg/
- fi
- ;;
- # Moderate Visual Impairment
- access=v2)
- 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/;/^enableMagnifier/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py
- fi
- 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
- gct -s -t bool /desktop/gnome/interface/accessibility true
- gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
- ;;
- # Minor Motor Difficulties
- access=m1)
- gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/mousekeys_enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep true
- gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
- 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
+ kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
+ if [ -d /root/usr/share/xubuntu-default-settings/accessibility ]; then
+ cp -a /root/usr/share/xubuntu-default-settings/accessibility/* /root/etc/xdg/
+ fi
+ ;;
+ # Moderate Visual Impairment
+ access=v2)
+ 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/;/^enableMagnifier/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py
+ fi
+ 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
+ gct -s -t bool /desktop/gnome/interface/accessibility true
+ gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
+ ;;
+ # Minor Motor Difficulties
+ access=m1)
+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
+ gct -s -t bool /desktop/gnome/accessibility/keyboard/mousekeys_enable true
+ gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
+ gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep true
+ gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
+ 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
- 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
- fi
- ;;
- # Motor Difficulties - pointing devices
- access=m2)
- gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
- gct -s -t bool /desktop/gnome/interface/accessibility true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep false
- gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
- gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
+ 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
+ fi
+ ;;
+ # Motor Difficulties - pointing devices
+ access=m2)
+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
+ gct -s -t bool /desktop/gnome/interface/accessibility true
+ gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
+ gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep false
+ gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
+ gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
- kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
- if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
- sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
- fi
- ;;
- esac
-done
+ kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
+ if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+ sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
+ fi
+ ;;
+esac
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/live-helpers
===================================================================
--- dists/trunk/live-initramfs/scripts/live-helpers 2007-05-06 16:59:54 UTC (rev 1336)
+++ dists/trunk/live-initramfs/scripts/live-helpers 2007-05-07 07:29:41 UTC (rev 1337)
@@ -110,10 +110,10 @@
load_keymap()
{
- # Load custom keymap
- if [ -x /bin/loadkeys -a -r /etc/boottime.kmap.gz ]; then
- loadkeys /etc/boottime.kmap.gz
- fi
+ # Load custom keymap
+ if [ -x /bin/loadkeys -a -r /etc/boottime.kmap.gz ]; then
+ loadkeys /etc/boottime.kmap.gz
+ fi
}
setup_loop() {
@@ -134,9 +134,9 @@
options="${options} -o ${offset}"
fi
if [ -z "${encryption}" ]; then
- losetup ${options} "${dev}" "${fspath}"
- else
- # Loop AES encryption
+ losetup ${options} "${dev}" "${fspath}"
+ else
+ # Loop AES encryption
while true; do
load_keymap
echo -n "Enter passphrase for ${fspath}: " >&6
@@ -154,14 +154,14 @@
echo -n "Something went wrong... Retry? [YES/no] " >&6
read answer
if [ 'no' = "${answer}" ]; then
- unset answer
+ unset answer
break
fi
done
- fi
- echo "$dev"
- return 0
- fi
+ fi
+ echo "$dev"
+ return 0
+ fi
done
panic "No loop devices available"
}
More information about the Debian-live-changes
mailing list