[Debian-live-changes] r2242 - in dists/trunk/live-initramfs: . debian docs manpages scripts scripts/live-premount
daniel at alioth.debian.org
daniel at alioth.debian.org
Mon Jun 25 10:01:57 UTC 2007
Author: daniel
Date: 2007-06-25 10:01:56 +0000 (Mon, 25 Jun 2007)
New Revision: 2242
Modified:
dists/trunk/live-initramfs/Makefile
dists/trunk/live-initramfs/debian/changelog
dists/trunk/live-initramfs/debian/control
dists/trunk/live-initramfs/debian/live-initramfs.init
dists/trunk/live-initramfs/docs/ChangeLog
dists/trunk/live-initramfs/manpages/live-initramfs.en.7
dists/trunk/live-initramfs/scripts/live
dists/trunk/live-initramfs/scripts/live-premount/10driver_updates
Log:
Modified: dists/trunk/live-initramfs/Makefile
===================================================================
--- dists/trunk/live-initramfs/Makefile 2007-06-24 18:47:22 UTC (rev 2241)
+++ dists/trunk/live-initramfs/Makefile 2007-06-25 10:01:56 UTC (rev 2242)
@@ -117,8 +117,8 @@
update:
set -e; for MANPAGE in manpages/*.en.*; \
do \
- sed -i -e 's/2007\\-06\\-18/2007\\-06\\-25/' \
- -e 's/1.91.1/1.91.2/' \
+ sed -i -e 's/2007\\-06\\-25/2007\\-07\\-02/' \
+ -e 's/1.91.2/1.91.3/' \
$$MANPAGE; \
done
Modified: dists/trunk/live-initramfs/debian/changelog
===================================================================
--- dists/trunk/live-initramfs/debian/changelog 2007-06-24 18:47:22 UTC (rev 2241)
+++ dists/trunk/live-initramfs/debian/changelog 2007-06-25 10:01:56 UTC (rev 2242)
@@ -1,4 +1,4 @@
-live-initramfs (1.91.2-1) UNRELEASED; urgency=medium
+live-initramfs (1.91.2-1) unstable; urgency=medium
* New upstream release.
Modified: dists/trunk/live-initramfs/debian/control
===================================================================
--- dists/trunk/live-initramfs/debian/control 2007-06-24 18:47:22 UTC (rev 2241)
+++ dists/trunk/live-initramfs/debian/control 2007-06-25 10:01:56 UTC (rev 2242)
@@ -10,8 +10,8 @@
Package: live-initramfs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, eject, file, initramfs-tools, sudo, user-setup
-Recommends: live-sysvinit
+Depends: ${shlibs:Depends}, ${misc:Depends}, file, initramfs-tools, sudo, user-setup
+Recommends: eject, live-sysvinit
Suggests: genext2fs, squashfs-tools
Conflicts: casper (<< 1.87)
Replaces: casper
Modified: dists/trunk/live-initramfs/debian/live-initramfs.init
===================================================================
--- dists/trunk/live-initramfs/debian/live-initramfs.init 2007-06-24 18:47:22 UTC (rev 2241)
+++ dists/trunk/live-initramfs/debian/live-initramfs.init 2007-06-25 10:01:56 UTC (rev 2242)
@@ -81,7 +81,10 @@
done
if [ -z ${QUICKREBOOT} ]; then
- eject -p -m /live_media >/dev/null 2>&1
+ if [ -x /usr/bin/eject ]
+ then
+ eject -p -m /live_media >/dev/null 2>&1
+ fi
# XXX - i18n
echo "Please remove the disc and close the tray (if any) then press ENTER: "
Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog 2007-06-24 18:47:22 UTC (rev 2241)
+++ dists/trunk/live-initramfs/docs/ChangeLog 2007-06-25 10:01:56 UTC (rev 2242)
@@ -1,5 +1,19 @@
-2007-06-17 Daniel Baumann <daniel at debiann.org>
+2007-06-25 Daniel Baumann <daniel at debian.org>
+ * scripts/live:
+ - Added missing nfsopts boot parameter.
+ - Changed default module name from 'order' to 'filesystem'.
+ - Changed module extension from '.lst' to '.module'.
+ - Check not just for $MODULE.module, but also
+ filesystem.$MODULE.module
+ - Cleaned up parse_cmdline and is_live_path functions.
+ * debian/control, debian/live-initramfs.init,
+ scripts/live-premount/10driver_updates:
+ - Moving eject to recommends.
+ - Added checks for eject existence.
+
+2007-06-17 Daniel Baumann <daniel at debian.org>
+
* debian/live-initramfs.postinst:
- Made update-initramfs call conditional as suggested by Thomas Lange
<lange at informatik.uni-koeln.de>.
Modified: dists/trunk/live-initramfs/manpages/live-initramfs.en.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.en.7 2007-06-24 18:47:22 UTC (rev 2241)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7 2007-06-25 10:01:56 UTC (rev 2242)
@@ -22,7 +22,7 @@
Set the accessibility level for physically or visually impared users. ACCESS must be one of v1, v2, v3, m1, or m2. v1=lesser visual impairment, v2=moderate visual impairment, v3=blindness, m1=minor motor difficulties, m2=moderate motor difficulties.
.IP "\fBconsole=\fR\fITTY\fR,\fISPEED\fR" 4
Set the default console to be used with the "live\-getty" option. Example: "console=ttyS0,115200"
-.IP "\fBhostname=\fR\fIHOSTNAME\fR, \fBusername=\fR\fIUSERFULLNAME\fR, \fBusername=\fR\fIUSERNAME\fR"4
+.IP "\fBhostname=\fR\fIHOSTNAME\fR, \fBusername=\fR\fIUSER\fR, \fBuserfullname=\fR\fIUSERFULLNAME\fR"4
Those parameters lets you override values read from the config file.
.IP "\fBintegrity\-check\fR" 4
If specified, an MD5 sum is calculated on the live media during boot and compared to the value found in md5sum.txt found in the root directory of the live media.
@@ -45,9 +45,11 @@
.IP "\fB{locale|debian\-installer/locale}=\fR\fILOCALE\fR" 4
Configure the running locale as specified, if not present the live\-media rootfs configured locale will be used and if also this one misses live\-initramfs 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 en:EN.UTF\-8), in this case if also "keyb=" is unspecified is set with those 2 lowercase letters (keyb=us). Beside that facility, only UTF8 locales are supported by live\-initramfs.
.IP "\fBmodule=\fR\fINAME\fR" 4
-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 "/live" directory of the live medium.
+Instead of using the default optional file "filesystem.module" (see below) another file could be specified without the extension ".module"; it should be placed on "/live" directory of the live medium.
.IP "\fBnetboot\fR[=nfs|cifs]" 4
This tells live\-initramfs to perform a network mount. The parameter "nfsroot=" (with optional "nfsopts="), should specify where is the location of the root filesystem. With no args, will try cifs first, and if it fails nfs.
+.IP "\fBnfsopts=\fR" 4
+This lets you specify custom nfs options.
.IP "\fBnoautologin\fR" 4
This parameter disables the automatic terminal login only, not touching gdk/kdm.
.IP "\fBnoxautologin\fR" 4
@@ -60,6 +62,10 @@
This parameter disables usage of local swap partitions.
.IP "\fBpersistent\fR" 4
live\-initramfs will look for persistent and snapshot partitions or files labeled "live\-rw", "home\-rw", and files called "live\-sn*", "home\-sn*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latter in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at \fIlive\-snapshot\fR(1) for more informations.
+.IP "\fB{preseed/file|file}=\fR\fIFILE\fR" 4
+A path to a file present on the rootfs could be used to preseed debconf database.
+.IP "\fBpackage/question=\fR\fIVALUE\fR" 4
+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.
.IP "\fBquickreboot\fR" 4
This option causes live\-initramfs to reboot without attempting to eject the media and without asking the user to remove the boot media.
.IP "\fBshowmounts\fR" 4
@@ -68,10 +74,6 @@
Adding this parameter, live\-initramfs will try to copy the entire read\-only media to the specified device before mounting the root filesystem. It probably needs a lot of free space. Subsequent boots should then skip this step and just specify the "live\-media=DEVICE" boot parameter with the same DEVICE used this time.
.IP "\fBtoram\fR" 4
Adding this parameter, live\-initramfs will try to copy the whole read\-only media to the computer's RAM before mounting the root filesystem. This could need a lot of ram, according to the space used by the read\-only media.
-.IP "\fB{preseed/file|file}=\fR\fIFILE\fR" 4
-A path to a file present on the rootfs could be used to preseed debconf database.
-.IP "\fBpackage/question=\fR\fIVALUE\fR" 4
-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.
.IP "\fBxdebconf\fR" 4
uses xdebconfigurator, if present on the rootfs, to configure X instead of the standard procedure (experimental).
.IP "\fBxvideomode=\fR\fIRESOLUTION\fR" 4
@@ -81,7 +83,7 @@
.B /etc/live.conf
some variables can be configured via this config file (inside the live system).
.TP
-.B /live/order.lst
+.B /live/filesystem.module
This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" 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 "/live" directory are loaded in alphanumeric order.
.SH SEE ALSO
Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live 2007-06-24 18:47:22 UTC (rev 2241)
+++ dists/trunk/live-initramfs/scripts/live 2007-06-25 10:01:56 UTC (rev 2242)
@@ -32,119 +32,226 @@
parse_cmdline ()
{
- PRESEEDS=
- # looking for live-initramfs specifics options as kernel parameters
- for x in $(cat /proc/cmdline); do
- case $x in
- userfullname=*)
- export USERFULLNAME=${x#userfullname=}
- export LIVECONF="changed"
- ;;
- hostname=*)
- export HOSTNAME=${x#hostname=}
- export LIVECONF="changed"
- ;;
- username=*)
- export USERNAME=${x#username=}
- export LIVECONF="changed"
- ;;
- netboot*)
- export NETBOOT=${x#netboot=} ;;
- access=*)
- export ACCESS=${x#access=} ;;
- xdebconf)
- export XDEBCONF="Yes" ;;
- xvideomode=*)
- export XVIDEOMODE="${x#xvideomode=}" ;;
- toram)
- export TORAM="Yes" ;;
- todisk=*)
- export TODISK=${x#todisk=} ;;
- noswap)
- export NOSWAP="Yes" ;;
- noautologin)
- export NOAUTOLOGIN="Yes" ;;
- noxautologin)
- export NOXAUTOLOGIN="Yes" ;;
- nosudo)
- export NOSUDO="Yes" ;;
- 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 LIVE_GETTY=1 ;;
- bootfrom=*|live-media=*)
- export LIVE_MEDIA=${x#*=} ;;
- live-media-encryption=*|encryption=*)
- export LIVE_MEDIA_ENCRYPTION=${x#*=} ;;
- live-media-timeout=*)
- export LIVE_MEDIA_TIMEOUT=${x#live-media-timeout=} ;;
- live-media-offset=*)
- export LIVE_MEDIA_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#*=}" ;;
- upgrade)
- export UPGRADE="Yes" ;;
- */*=*)
- question="${x%%=*}"
- value="${x#*=}"
- PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
- ;;
- console=*)
- export DEFCONSOLE="${x#*=}" ;;
- esac
- done
+ PRESEEDS=
- # sort of compatibility with netboot.h from linux docs
- if [ -z "${NETBOOT}" ]; then
- if [ "${ROOT}" = "/dev/nfs" ]; then
- NETBOOT="nfs"
- export NETBOOT
- elif [ "${ROOT}" = "/dev/cifs" ]; then
- NETBOOT="cifs"
- export NETBOOT
- fi
- fi
+ # looking for live-initramfs specifics options as kernel parameters
- if [ -z "${MODULE}" ]; then
- MODULE=order
- fi
+ for x in $(cat /proc/cmdline)
+ do
+ case $x in
+ access=*)
+ ACCESS=${x#access=}
+ export ACCESS
+ ;;
+
+ console=*)
+ DEFCONSOLE="${x#*=}"
+ export DEFCONFSOLE
+ ;;
+
+ hostname=*)
+ HOSTNAME=${x#hostname=}
+ LIVECONF="changed"
+ export HOSTNAME LIVECONF
+ ;;
+
+ username=*)
+ USERNAME=${x#username=}
+ LIVECONF="changed"
+ export USERNAME LIVECONF
+ ;;
+
+ userfullname=*)
+ USERFULLNAME=${x#userfullname=}
+ LIVECONF="changed"
+ export USERFULLNAME LIVECONF
+ ;;
+
+ ip*)
+ STATICIP=${x#ip=}
+
+ if [ -z "${STATICIP}" ]
+ then
+ STATICIP="frommedia"
+ fi
+
+ export STATICIP
+ ;;
+
+ keyb=*|kbd-chooser/method=*)
+ KBD=${x#*=}
+ export KBD
+ ;;
+
+ klayout=*|console-setup/layoutcode=*)
+ KLAYOUT=${x#*=}
+ export KLAYOUT
+ ;;
+
+ kvariant=*|console-setup/variantcode=*)
+ KVARIANT=${x#*=}
+ export KVARIANT
+ ;;
+
+ kmodel=*|console-setup/modelcode=*)
+ KMODEL=${x#*=}
+ ;;
+
+ koptions=*)
+ KOPTIONS=${x#koptions=}
+ ;;
+
+ live-getty)
+ LIVE_GETTY=1
+ export LIVE_GETTY
+ ;;
+
+ live-media=*|bootfrom=*)
+ LIVE_MEDIA=${x#*=}
+ export LIVE_MEDIA
+ ;;
+
+ live-media-encryption=*|encryption=*)
+ LIVE_MEDIA_ENCRYPTION=${x#*=}
+ export LIVE_MEDIA_ENCRYPTION
+ ;;
+
+ live-media-offset=*)
+ LIVE_MEDIA_OFFSET=${x#live-media-offset=}
+ export LIVE_MEDIA_OFFSET
+ ;;
+
+ live-media-timeout=*)
+ LIVE_MEDIA_TIMEOUT=${x#live-media-timeout=}
+ export LIVE_MEDIA_TIMEOUT
+ ;;
+
+ locale=*|debian-installer/locale=*)
+ LOCALE=${x#*=}
+ export LOCALE
+ ;;
+
+ module=*)
+ MODULE=${x#module=}
+ export MODULE
+ ;;
+
+ netboot*)
+ NETBOOT=${x#netboot=}
+ export NETBOOT
+ ;;
+
+ nfsopts=)
+ NFSOPTS=${x#nfsopts=}
+ export NFSOPTS
+ ;;
+
+ noautologin)
+ NOAUTOLOGIN="Yes"
+ export NOAUTOLOGIN
+ ;;
+
+ noxautologin)
+ NOXAUTOLOGIN="Yes"
+ export NOXAUTOLOGIN
+ ;;
+
+ nopersistent)
+ PERSISTENT=""
+ export PERSISTENT
+ ;;
+
+ nosudo)
+ NOSUDO="Yes"
+ export NOSUDO
+ ;;
+
+ noswap)
+ NOSWAP="Yes"
+ export NOSWAP
+ ;;
+
+ persistent)
+ PERSISTENT="Yes"
+ export PERSISTENT
+ ;;
+
+ preseed/file=*|file=*)
+ LOCATION="${x#*=}"
+ export LOCATION
+ ;;
+
+ */*=*)
+ question="${x%%=*}"
+ value="${x#*=}"
+ PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
+
+ export PRESEEDS
+ ;;
+
+ showmounts)
+ SHOWMOUNTS="Yes"
+ export SHOWMOUNTS
+ ;;
+
+ todisk=*)
+ TODISK=${x#todisk=}
+ export TODISK
+ ;;
+
+ toram)
+ TORAM="Yes"
+ export TORAM
+ ;;
+
+ xdebconf)
+ XDEBCONF="Yes"
+ export XDEBCONF
+ ;;
+
+ xvideomode=*)
+ XVIDEOMODE="${x#xvideomode=}"
+ export XVIDEOMODE
+ ;;
+ esac
+ done
+
+ # sort of compatibility with netboot.h from linux docs
+ if [ -z "${NETBOOT}" ]
+ then
+ if [ "${ROOT}" = "/dev/nfs" ]
+ then
+ NETBOOT="nfs"
+ export NETBOOT
+ elif [ "${ROOT}" = "/dev/cifs" ]
+ then
+ NETBOOT="cifs"
+ export NETBOOT
+ fi
+ fi
+
+ if [ -z "${MODULE}" ]
+ then
+ MODULE="filesystem"
+ fi
}
-is_live_path() {
- path=$1
- if [ -d "$path/live" ]; then
- if [ "$(echo $path/live/*.squashfs)" != "$path/live/*.squashfs" ] ||
- [ "$(echo $path/live/*.ext2)" != "$path/live/*.ext2" ] ||
- [ "$(echo $path/live/*.ext3)" != "$path/live/*.ext3" ] ||
- [ "$(echo $path/live/*.dir)" != "$path/live/*.dir" ]; then
- return 0
- fi
- fi
- return 1
+is_live_path()
+{
+ DIRECTORY="${1}"
+
+ if [ -d "${DIRECTORY}"/live ]
+ then
+ for FILESYSTEM in squashfs ext2 ext3 xfs dir
+ do
+ if [ "`echo ${DIRECTORY}/live/*.${FILESYSTEM}`" != "${DIRECTORY}/live/*.${FILESYSTEM}" ]
+ then
+ return 0
+ fi
+ done
+ fi
+
+ return 1
}
get_backing_device() {
@@ -431,24 +538,40 @@
roopt="ro"
fi
- # Read image names from ${MODULE}.lst if it exists
- if [ -e "${image_directory}/${MODULE}.lst" ]; then
- for image in $(cat "${image_directory}/${MODULE}.lst"); do
- image_string="${image_string} ${image_directory}/${image}";
- done
- else
- # If ${MODULE}.lst does not exist, create a list of images
- for image_type in "ext2" "ext3" "squashfs" "dir"; do
- for image in "${image_directory}"/*."${image_type}"; do
- if [ -e "${image}" ]; then
- image_string="${image_string} ${image}";
+ if [ -n "${MODULE}" ]
+ then
+ # Read image names from ${MODULE}.module if it exists
+ if [ -e "${image_directory}/filesystem.${MODULE}.module" ]
+ then
+ FILE="${image_directory}/filesystem.${MODULE}.module"
+ elif [ -e "${image_directory}/${MODULE}.module" ]
+ then
+ FILE="${image_directory}/${MODULE}.module"
+ else
+ panic "Could not find module ${MODULE}"
fi
- done
- done
- # Now sort the list
- image_string=$(echo ${image_string} | sed -e 's/ /\n/g' | sort )
- fi
+ for IMAGE in `cat ${FILE}`
+ do
+ image_string="${image_string} ${image_directory}/${image}"
+ done
+ else
+ # ${MODULE}.module does not exist, create a list of images
+ for FILESYSTEM in squashfs ext2 ext3 xfs dir
+ do
+ for IMAGE in "${image_directory}"/*."${FILESYSTEM}"
+ do
+ if [ -e "${IMAGE}" ]
+ then
+ image_string="${image_string} ${IMAGE}"
+ fi
+ done
+ done
+
+ # Now sort the list
+ image_string=$(echo ${image_string} | sed -e 's/ /\n/g' | sort )
+ fi
+
mkdir -p "${croot}"
for image in ${image_string}; do
imagename=$(basename "${image}")
Modified: dists/trunk/live-initramfs/scripts/live-premount/10driver_updates
===================================================================
--- dists/trunk/live-initramfs/scripts/live-premount/10driver_updates 2007-06-24 18:47:22 UTC (rev 2241)
+++ dists/trunk/live-initramfs/scripts/live-premount/10driver_updates 2007-06-25 10:01:56 UTC (rev 2242)
@@ -130,7 +130,11 @@
# GDMCONF=/etc/gdm/gdm.conf
#fi
-eject
+if [ -x /usr/bin/eject ]
+then
+ eject
+fi
+
log_wait_msg "Insert a driver CD and press ENTER ($DPKG_ARCH)"
log_begin_msg "Looking for driver update CD"
@@ -156,8 +160,12 @@
mkdir -p /tmp/driver-updates
cp $updates_root/*_$DPKG_ARCH.deb /tmp/driver-updates/
umount $mountpoint
-eject
+if [ -x /usr/bin/eject ]
+then
+ eject
+fi
+
log_end_msg
log_wait_msg "Re-insert install CD and press ENTER."
More information about the Debian-live-changes
mailing list