diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | bin/live-snapshot | 8 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 12 | ||||
| -rwxr-xr-x[-rw-r--r--] | debian/init (renamed from debian/live-initramfs.init) | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | debian/postinst (renamed from debian/live-initramfs.postinst) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | debian/postrm (renamed from debian/live-initramfs.postrm) | 0 | ||||
| -rw-r--r-- | docs/ChangeLog | 13 | ||||
| -rw-r--r-- | manpages/live-initramfs.en.7 | 4 | ||||
| -rw-r--r-- | manpages/live-snapshot.en.1 | 4 | ||||
| -rw-r--r-- | manpages/live-snapshot.it.1 | 2 | ||||
| -rwxr-xr-x | scripts/live | 19 | ||||
| -rwxr-xr-x | scripts/live-bottom/01integrity_check | 2 | ||||
| -rwxr-xr-x | scripts/live-bottom/05mountpoints | 6 |
14 files changed, 52 insertions, 33 deletions
@@ -118,9 +118,9 @@ uninstall: update: set -e; for MANPAGE in manpages/*.en.*; \ do \ - sed -i -e 's/2007\\-06\\-25/2007\\-07\\-02/' \ - -e 's/25.06.2007/02.07.2007/' \ - -e 's/1.91.2/1.91.3/' \ + sed -i -e 's/2007\\-07\\-02/2007\\-07\\-09/' \ + -e 's/02.07.2007/09.07.2007/' \ + -e 's/1.91.3/1.91.4/' \ $$MANPAGE; \ done diff --git a/bin/live-snapshot b/bin/live-snapshot index dd1875f..a7214bd 100755 --- a/bin/live-snapshot +++ b/bin/live-snapshot @@ -3,7 +3,7 @@ # live-snapshot - utility to manage Debian Live systems snapshots # # This program mount a device (fallback to /tmpfs under /mnt/snapshot -# and save the /cow (or a different dir) filesystem in it for reusing +# and save the /live/cow (or a different dir) filesystem in it for reusing # in another live-initramfs session. Look at manpage for more info. # # Copyright (C) 2006 Marco Amadori <marco.amadori@gmail.com> @@ -90,7 +90,7 @@ Help () Header echo echo "Options:" - echo " -c, --cow: specifies the copy on write directory (default: /cow)." + echo " -c, --cow: specifies the copy on write directory (default: /live/cow)." echo " -d, --device: specifies the output snapshot device (default: none)." echo " -o, --output: specifies the output image file (default: $type dependent)." echo " -r, --resync-string: internally used to resync previous made snapshots." @@ -224,7 +224,7 @@ Mount_device () Defaults () { MOUNTP="/mnt/live-snapshot" - COW="/cow" + COW="/live/cow" DEV="" DEST="${MOUNTP}/live-sn.cpio.gz" TYPE="cpio" @@ -248,7 +248,7 @@ Defaults () Usage "Unregognized String" ;; esac else - DEF_COW="/cow" + DEF_COW="/live/cow" # Bad options handling if [ -z "${SNAP_COW}" ]; then COW="${DEF_COW}" diff --git a/debian/changelog b/debian/changelog index 4b3a1c8..5971009 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +live-initramfs (1.91.4-1) unstable; urgency=medium + + * New upstream release: + - Dropping transitional package, not needed anymore. + + -- Daniel Baumann <daniel@debian.org> Mon, 9 Jul 2007 00:00:00 +0200 + live-initramfs (1.91.3-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index e3bdb83..1d3d3cd 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, file, initramfs-tools, sudo, user-setup Recommends: eject, live-initscripts Suggests: genext2fs, squashfs-tools -Conflicts: casper (<< 1.87) +Conflicts: casper Replaces: casper Description: Debian Live initramfs hook live-initramfs is a hook for the initramfs-tools, used to generate a initramfs @@ -31,13 +31,3 @@ Description: Debian Live initramfs hook Homepage: <http://debian-live.alioth.debian.org/> . live-initramfs is a fork of casper <http://packages.ubuntu.com/casper/>. - -Package: casper -Architecture: all -Depends: live-initramfs -Description: Debian Live initramfs hook (transitional package) - Package to ease upgrading from older casper package to the new live-initramfs - package. - . - This package can be purged at anytime once the live-initramfs package has been - installed. diff --git a/debian/live-initramfs.init b/debian/init index cbad459..d515c39 100644..100755 --- a/debian/live-initramfs.init +++ b/debian/init @@ -83,7 +83,7 @@ do_stop () if [ -z ${QUICKREBOOT} ]; then if [ -x /usr/bin/eject ] then - eject -p -m /live_media >/dev/null 2>&1 + eject -p -m /live/image >/dev/null 2>&1 fi # XXX - i18n diff --git a/debian/live-initramfs.postinst b/debian/postinst index 752b161..752b161 100644..100755 --- a/debian/live-initramfs.postinst +++ b/debian/postinst diff --git a/debian/live-initramfs.postrm b/debian/postrm index 752b161..752b161 100644..100755 --- a/debian/live-initramfs.postrm +++ b/debian/postrm diff --git a/docs/ChangeLog b/docs/ChangeLog index 049cf29..6f8d95c 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,16 @@ +2007-07-12 Daniel Baumann <daniel@debian.org> + + * bin/live-snapshot, scripts/live: + - Moved /cow to /live/cow. + * scripts/live, scripts/live-bottom/01integrity_check, 05mountpoints: + - Moved /live_media to /live/image. + * Uploaded 1.91.4-1. + +2007-07-07 Daniel Baumann <daniel@debian.org> + + * scripts/live: + - Added debug parameter. + 2007-06-31 Daniel Baumann <daniel@debian.org> * scripts/live: diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7 index cfbf0a1..b44467e 100644 --- a/manpages/live-initramfs.en.7 +++ b/manpages/live-initramfs.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-INITRAMFS 7 "2007\-07\-02" "1.91.3" "live\-initramfs" +.TH LIVE\-INITRAMFS 7 "2007\-07\-09" "1.91.4" "live\-initramfs" .SH NAME live\-initramfs \- Debian Live initramfs hook @@ -22,6 +22,8 @@ Here is the complete list of recognized boot parameters by live\-initramfs. 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 "\fBdebug\fR" 4 +Makes initramfs boot process more verbose. .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 diff --git a/manpages/live-snapshot.en.1 b/manpages/live-snapshot.en.1 index ad37aef..05c1221 100644 --- a/manpages/live-snapshot.en.1 +++ b/manpages/live-snapshot.en.1 @@ -1,4 +1,4 @@ -.TH LIVE\-SNAPSHOT 1 "2007\-07\-02" "1.91.3" "live\-initramfs" +.TH LIVE\-SNAPSHOT 1 "2007\-07\-09" "1.91.4" "live\-initramfs" .SH NAME live\-snapshot \- a simple script to ease persistence usage @@ -35,7 +35,7 @@ live\-snapshot is a script which can be used to build the right types of persist .SH OPTIONS .IP "\fB\-c, \-\-cow\fR \fIDIRECTORY\fR" 4 specifies the input directory to be cloned in the image file. -Its default value "/cow" should be right for most uses. However it could be handy to specify "/home" and type ext2 for the type to prepare an image file suited to be directly mounted by live-initramfs as home. +Its default value "/live/cow" should be right for most uses. However it could be handy to specify "/home" and type ext2 for the type to prepare an image file suited to be directly mounted by live-initramfs as home. .IP "\fB\-d, \-\-device\fR \fIDEVICE\fR" 4 sets the device where the media which the snapshot/persistence file/partition will be put. If it is not specified, a tmpfs will be used and linked to the user's desktop to move it where it is needed. If the device has no filesystem, an ext2 fs will be automatically created and labelled according to the values specified after the "--output" value or with a sane default. .IP "\fB\-e, \-\-exclude\-list\fR \fIFILE\fR" 4 diff --git a/manpages/live-snapshot.it.1 b/manpages/live-snapshot.it.1 index c82e744..80fd34b 100644 --- a/manpages/live-snapshot.it.1 +++ b/manpages/live-snapshot.it.1 @@ -34,7 +34,7 @@ live\-snapshot \[`e] uno script che pu\[`o] essere usato per costruire un file i .SH OPTIONS .IP "\fB\-c, \-\-cow\fR \fIDIRECTORY\fR" 4 -specifica la directory da clonare nel file immagine. Il valore di default \[`e] lo stesso default usato da live\-initramfs per la sua directory COW (copy on write, un tempo situata in "/cow") ed \[`e] sufficiente per gli usi comuni. Pu\[`o] essere utile tuttavia specificare "/home" e come tipo "ext2" per preparare un file immagine adatto per essere montato da live\-initramfs come "/home" al boot. +specifica la directory da clonare nel file immagine. Il valore di default \[`e] lo stesso default usato da live\-initramfs per la sua directory COW (copy on write, un tempo situata in "/live/cow") ed \[`e] sufficiente per gli usi comuni. Pu\[`o] essere utile tuttavia specificare "/home" e come tipo "ext2" per preparare un file immagine adatto per essere montato da live\-initramfs come "/home" al boot. .IP "\fB\-d, \-\-device\fR \fIDEVICE\fR" 4 seleziona il device dove il file/partizione di snapshot o persistenza dovr\[`a] essere sistemato. Se il device non ha un filesystem, ne verr\[`a] creato uno automaticamente, di tipo ext2 ed etichettato (label) in base al valore specificato nell'opzione "--output" o con un default. Se non viene specificato nessun device, verr\[`a] usato un "tmpfs" linkato sul desktop dell'utente, in modo che port\[`a] essere mosso dove si vuole. .IP "\fB\-e, \-\-exclude\-list\fR \fIFILE\fR" 4 diff --git a/scripts/live b/scripts/live index 5397837..35ba702 100755 --- a/scripts/live +++ b/scripts/live @@ -7,7 +7,7 @@ export PATH=/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin echo "/root/lib" >> /etc/ld.so.conf echo "/root/usr/lib" >> /etc/ld.so.conf -mountpoint=/live_media +mountpoint=/live/image root_persistence="live-rw" home_persistence="home-rw" @@ -49,6 +49,13 @@ parse_cmdline () export DEFCONFSOLE ;; + debug) + DEBUG="Yes" + export DEBUG + + set -x + ;; + hostname=*) HOSTNAME=${x#hostname=} LIVECONF="changed" @@ -143,7 +150,7 @@ parse_cmdline () export NETBOOT ;; - nfsopts=) + nfsopts=*) NFSOPTS=${x#nfsopts=} export NFSOPTS ;; @@ -201,7 +208,7 @@ parse_cmdline () export SHOWMOUNTS ;; - timezone=*) + timezone=*) TIMEZONE="${x#timezone=}" export TIMEZONE ;; @@ -659,8 +666,8 @@ setup_unionfs() { fi # shows cow fs on /cow for use by live-snapshot - mkdir -p "${rootmnt}/cow" - mount -o bind /cow "${rootmnt}/cow" + mkdir -p "${rootmnt}/live/cow" + mount -o bind /cow "${rootmnt}/live/cow" } check_dev () @@ -793,7 +800,7 @@ mountroot() { live_dest="${TODISK}" fi if [ "${live_dest}" ]; then - log_begin_msg "Copying live_media to ${live_dest}" + log_begin_msg "Copying live media to ${live_dest}" copy_live_to "${livefs_root}" "${live_dest}" log_end_msg fi diff --git a/scripts/live-bottom/01integrity_check b/scripts/live-bottom/01integrity_check index bd88a76..b855b62 100755 --- a/scripts/live-bottom/01integrity_check +++ b/scripts/live-bottom/01integrity_check @@ -20,4 +20,4 @@ esac # live-initramfs script -grep integrity-check /proc/cmdline && live-md5check /live_media /live_media/md5sum.txt < /dev/tty8 +grep integrity-check /proc/cmdline && live-md5check /live/image /live/image/md5sum.txt < /dev/tty8 diff --git a/scripts/live-bottom/05mountpoints b/scripts/live-bottom/05mountpoints index 82cc7c3..028c74b 100755 --- a/scripts/live-bottom/05mountpoints +++ b/scripts/live-bottom/05mountpoints @@ -27,9 +27,9 @@ log_begin_msg "Moving mount points..." # live-initramfs script # Move to the new root filesystem so that programs there can get at it. -if [ ! -d /root/live_media ]; then - mkdir -p /root/live_media - mount -n --move /live_media /root/live_media +if [ ! -d /root/live/image ]; then + mkdir -p /root/live/image + mount -n --move /live/image /root/live/image fi log_end_msg |