Adding live-initramfs 1.91.3-1.

diff --git a/Makefile b/Makefile
index 0121a19..a389356 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 CFLAGS = -Wall -g -O2
 BUILD_SYSTEM := $(shell lsb_release --short --id)
 
-TRANSLATIONS=""
+TRANSLATIONS="it"
 
 all: build
 
@@ -83,6 +83,7 @@ uninstall:
        rm -rf $(DESTDIR)/usr/share/live-initramfs
        rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
        rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live*
+       rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/live
 
        # Uninstalling documentation
        rm -rf $(DESTDIR)/usr/share/doc/live-initramfs
@@ -118,6 +119,7 @@ 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/' \
                $$MANPAGE; \
        done

diff --git a/bin/live-snapshot b/bin/live-snapshot
index 3f9c11c..dd1875f 100755 (executable)
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -23,7 +23,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 # On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
+# can be found in /usr/share/common-licenses/GPL-2 file.
 
 PROGRAM="`basename $0`"
 VERSION=0.0.1
@@ -120,7 +120,7 @@ Version ()
        echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
        echo
        echo "On Debian systems, the complete text of the GNU General Public License"
-       echo "can be found in /usr/share/common-licenses/GPL file."
+       echo "can be found in /usr/share/common-licenses/GPL-2 file."
        echo
        echo "Homepage: <http://debian-live.alioth.debian.org/>"
        exit 0

diff --git a/debian/changelog b/debian/changelog
index 1aef5a5..4b3a1c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.91.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon,  2 Jul 2007 00:00:00 +0200
+
 live-initramfs (1.91.2-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 79c15b0..e3bdb83 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-initramfs
 Package: live-initramfs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, file, initramfs-tools, sudo, user-setup
-Recommends: eject, live-sysvinit
+Recommends: eject, live-initscripts
 Suggests: genext2fs, squashfs-tools
 Conflicts: casper (<< 1.87)
 Replaces: casper

diff --git a/debian/copyright b/debian/copyright
index 0174d36..792ac76 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,7 +34,7 @@ License:
        Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
 
 License (live-md5check/md5.c, live-md5check/md5,h):
 
@@ -61,4 +61,4 @@ License (live-md5check/md5.c, live-md5check/md5,h):
        distribution.
 
 The Debian packaging is (C) 2007, Daniel Baumann <daniel@debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

diff --git a/docs/ChangeLog b/docs/ChangeLog
index d387f0b..049cf29 100644 (file)
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,24 @@
+2007-06-31  Daniel Baumann  <daniel@debian.org>
+
+       * scripts/live:
+         - Added patch from Julian Andres Klode <jak@jak-linux.org> to add
+           support for aufs.
+       * hooks/live, manpage/live-initramfs.en.7, scripts/live-bottom/12fstab:
+         - Added aufs support.
+       * Uploaded 1.91.3-1.
+
+2007-06-30  Daniel Baumann  <daniel@debian.org>
+
+       * scripts/live-bottom/12fstab:
+         - Added disabling of /etc/init.d/checkfs.sh to avoid file systemcheck
+           at boot time. Added nofastboot parameter to be able to change that.
+         - Disabled removal of checkroot.sh.
+
+2007-06-28  Daniel Baumann  <daniel@debian.org>
+
+       * Applied patch from Mathieu Geli <mathieu.geli@gmail.com> to set the
+         timezone with a boot parameter.
+
 2007-06-25  Daniel Baumann  <daniel@debian.org>
 
        * scripts/live:
@@ -52,7 +73,7 @@
 2007-05-28  Daniel Baumann  <daniel@debian.org>
 
        * scripts/live-bottom/42apt_upgrade:
-         - Moved to dedicated live-sysvinit package.
+         - Moved to dedicated live-initscripts package.
 
 2007-05-24  Daniel Baumann  <daniel@debian.org>
 

diff --git a/hooks/live b/hooks/live
index 2e83ab2..0ed58d8 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -73,8 +73,9 @@ copy_exec /sbin/losetup /sbin
 manual_add_modules loop
 manual_add_modules squashfs
 
-# Filesystem: unionfs
+# Filesystem: unionfs/aufs
 manual_add_modules unionfs
+manual_add_modules aufs
 
 # Filesystem: vfat
 manual_add_modules nls_cp437

diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7
index 56e5c8c..cfbf0a1 100644 (file)
--- a/manpages/live-initramfs.en.7
+++ b/manpages/live-initramfs.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-INITRAMFS 7 "2007\-06\-25" "1.91.2" "live\-initramfs"
+.TH LIVE\-INITRAMFS 7 "2007\-07\-02" "1.91.3" "live\-initramfs"
 
 .SH NAME
 live\-initramfs \- Debian Live initramfs hook
@@ -26,8 +26,8 @@ Set the default console to be used with the "live\-getty" option. Example: "cons
 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.
-.IP "\fBip=\fR\fIIFACE,ADDRESS,NETMASK,GATEWAY [:IFACE,ADDRESS,NETMASK,GATEWAY]\fR*" 4
-Let you specify the name(s) and the options of the interface(s) that should be configured at boot time. Do not specify this if you want to use dhcp (default). It will be changed in a future release to mimick official kernel boot param specification.
+.IP "\fBip=\fR\fI[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF] [,[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF]]\fR*" 4
+Let you specify the name(s) and the options of the interface(s) that should be configured at boot time. Do not specify this if you want to use dhcp (default). It will be changed in a future release to mimick official kernel boot param specification (e.g. ip=10.0.0.1::10.0.0.254:255.255.255.0::eth0,:::::eth1:dhcp).
 .IP "\fBip\fR[=frommedia]" 4
 If this variable is set, dhcp and static configuration are just skipped and the system will use the (must be) media\-preconfigured /etc/network/interfaces instead.
 .IP "\fB{keyb|kbd\-chooser/method}=\fR\fIKEYBOARD\fR, \fB{klayout|console\-setup/layoutcode}=\fR\fILAYOUT\fR, \fB{kvariant|console\-setup/variantcode}=\fR\fIVARIANT\fR, \fB{kmodel|console\-setup/modelcode}=\fR\fICODE\fR, \fBkoptions=\fR\fIOPTIONS\fR" 4
@@ -54,6 +54,8 @@ This lets you specify custom nfs options.
 This parameter disables the automatic terminal login only, not touching gdk/kdm.
 .IP "\fBnoxautologin\fR" 4
 This parameter disables the automatic login of gdm/kdm only, not touching terminals.
+.IP "\fBnofastboot\fR" 4
+This parameter disables the default disabling of filesystem checks in /etc/fstab. If you have static filesystems on your harddisk and you want them to be checked at boot time, use this parameter, otherwise they are skipped.
 .IP "\fBnopersistent\fR" 4
 disables the "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled.
 .IP "\fBnosudo\fR" 4
@@ -70,10 +72,14 @@ All debian installed packages could be preseeded from command\-line that way, be
 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
 This parameter will make live\-initramfs to show on "/" the ro filesystems (mostly compressed) on "/live". This is not enabled by default because could lead to problems by applications like "mono" which store binary paths on installation.
+.IP "\fBtimezone=\fR\fITIMEZONE" 4
+By default, timezone is set to UTC. Using the timezone parameter, you can set it to your local zone, e.g. Europe/Zurich.
 .IP "\fBtodisk=\fR\fIDEVICE" 4
 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 "\fBunion=\fRunionfs|aufs" 4
+By default, live-initramfs uses unionfs. With this parameter, you can switch to aufs.
 .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
@@ -93,7 +99,7 @@ This optional file (inside the live media) contains a list of white\-space or ca
 .PP
 \fIlive\-helper\fR(7)
 .PP
-\fIlive\-sysvinit\fR(7)
+\fIlive\-initscripts\fR(7)
 .PP
 \fIlive\-webhelper\fR(7)
 

diff --git a/manpages/live-snapshot.en.1 b/manpages/live-snapshot.en.1
index 4f85315..ad37aef 100644 (file)
--- a/manpages/live-snapshot.en.1
+++ b/manpages/live-snapshot.en.1
@@ -1,4 +1,4 @@
-.TH LIVE\-SNAPSHOT 1 "2007\-06\-25" "1.91.2" "live\-initramfs"
+.TH LIVE\-SNAPSHOT 1 "2007\-07\-02" "1.91.3" "live\-initramfs"
 
 .SH NAME
 live\-snapshot \- a simple script to ease persistence usage

diff --git a/manpages/live-snapshot.it.1 b/manpages/live-snapshot.it.1
new file mode 100644 (file)
index 0000000..c82e744
--- /dev/null
+++ b/manpages/live-snapshot.it.1
@@ -0,0 +1,70 @@
+.TH LIVE\-SNAPSHOT 1 "02.07.2007" "1.91.3" "live\-initramfs"
+
+.SH NAME
+live\-snapshot \- uno script per facilitare l'uso della persistenza sui sistemi live
+
+.SH SYNOPSIS
+.B live\-snapshot
+.RB [\| \-c \||\| \-\-cow
+.IR DIRECTORY ]
+.RB [\| \-d \||\| \-\-device
+.IR DEVICE \|]
+.RB [\| \-e \||\| \-\-exclude\-list
+.IR FILE \|]
+.RB [\| \-o \||\| \-\-output
+.IR FILE \|]
+.RB [\| \-t \||\| \-\-type
+.IR TYPE \|]
+.PP
+.B live\-snapshot
+.RB [\| \-r \||\| \-\-resync\-string
+.IR STRING \|]
+.PP
+.B live\-snapshot
+.RB [\| \-h \||\| \-\-help \|]
+.br
+.B live\-snapshot
+.RB [\| \-u \||\| \-\-usage \|]
+.br
+.B live-snapshot
+.RB [\| \-v \||\| \-\-version \|]
+
+.SH DESCRIPTION
+live\-snapshot \[`e] uno script che pu\[`o] essere usato per costruire un file immagine formattato correttamente per essere usato da \fIlive\-initramfs\fR(7); viene inoltre usato dallo script di init di live\-initramfs in uscita per sincronizzare i device di snapshot riconosciuti al boot.
+
+.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.
+.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
+un file contenente una lista di file e percorsi che NON devono essere salvati. Questa lista verr\[`a] inclusa nello snapshot per essere riutilizzata.
+.IP "\fB\-o, \-\-output\fR \fIFILE\fR" 4
+il nome del file o l'etichetta (label) da usare per il file o la partizione di snapshot. Se non specificata, live\-snapshot cercher\[`a] un file all'interno del device oppure user\[`a] l'intera partizione.
+.IP "\fB\-r, \-\-resync\-string\fR \fISTRING\fR" 4
+usato internamente nelle sincronizzazioni dallo script di init di live\-initramfs. Il formato pu\[`o] cambiare, usatelo a vostro rischio.
+.IP "\fB\-t, \-\-type\fR \fITYPE\fR" 4
+il tipo pu\[`o] essere "cpio", "squashfs" o "ext2".
+.PP
+.IP "\fB\-h, \-\-help\fR" 4
+mostra l'aiuto ed esce
+.IP "\fB\-u, \-\-usage\fR" 4
+mostra l'utilizzo ed esce
+.IP "\fB\-v, \-\-version\fR" 4
+da informazioni sulla versione ed esce
+
+.SH SEE ALSO
+\fIlive\-initramfs\fR(8)
+.PP
+Questo programma fa parte di live\-initramfs.
+
+.SH BUGS
+Riportate i bug sul pacchetto live\-initramfs <\fIhttp://packages.qa.debian.org/live\-initramfs/\fR>.
+
+.SH HOMEPAGE
+Ulteriori informazioni su progetto Debian Live possono essere trovate su <\fIhttp://debian\-live.alioth.debian.org/\fR> e <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHORS
+live\-initramfs \[`e] mantenuto da Daniel Baumann <\fIdaniel@debian.org\fR> e Marco Amadori <\fImarco.amadori@gmail.com\fR> per il progetto Debian.
+.PP
+live\-initramfs \[`e] un fork di casper <\fIhttp://packages.ubuntu.com/casper/\fR>. casper \[`e] stato scritto originariamente da Tollef Fog Heen <\fItfheen@canonical.com\fR> e Matt Zimmerman <\fImdz@canonical.com\fR>.

diff --git a/scripts/live b/scripts/live
index 26fde4d..5397837 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -95,10 +95,12 @@ parse_cmdline ()
 
                        kmodel=*|console-setup/modelcode=*)
                                KMODEL=${x#*=}
+                               export KMODEL
                                ;;
 
                        koptions=*)
                                KOPTIONS=${x#koptions=}
+                               export KOPTIONS
                                ;;
 
                        live-getty)
@@ -156,6 +158,11 @@ parse_cmdline ()
                                export NOXAUTOLOGIN
                                ;;
 
+                       nofastboot)
+                               NOFASTBOOT="Yes"
+                               export NOFASTBOOT
+                               ;;
+
                        nopersistent)
                                PERSISTENT=""
                                export PERSISTENT
@@ -194,6 +201,11 @@ parse_cmdline ()
                                export SHOWMOUNTS
                                ;;
 
+                      timezone=*)
+                               TIMEZONE="${x#timezone=}"
+                               export TIMEZONE
+                               ;;
+
                        todisk=*)
                                TODISK=${x#todisk=}
                                export TODISK
@@ -204,6 +216,11 @@ parse_cmdline ()
                                export TORAM
                                ;;
 
+                       union=*)
+                               UNIONTYPE="${x#union=}"
+                               export UNIONTYPE
+                               ;;
+
                        xdebconf)
                                XDEBCONF="Yes"
                                export XDEBCONF
@@ -233,6 +250,13 @@ parse_cmdline ()
        if [ -z "${MODULE}" ]
        then
                MODULE="filesystem"
+               export MODULE
+       fi
+
+       if [ -z "${UNIONTYPE}" ]
+       then
+               UNIONTYPE="unionfs"
+               export UNIONTYPE
        fi
 }
 
@@ -520,7 +544,7 @@ setup_unionfs() {
     image_directory="$1"
     rootmnt="$2"
 
-    modprobe "${MP_QUIET}" -b unionfs
+    modprobe "${MP_QUIET}" -b ${UNIONTYPE}
 
     # run-init can't deal with images in a subdir, but we're going to
     # move all of these away before it runs anyway.  No, we're not,
@@ -604,7 +628,7 @@ setup_unionfs() {
 
     mount ${cowdevice} -t ${cow_fstype} -o rw /cow || panic "Can not mount $cowdevice on /cow"
 
-    mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt" || panic "Unionfs mount failed"
+    mount -t ${UNIONTYPE} -o dirs=/cow=rw:$rofsstring ${UNIONTYPE} "$rootmnt" || panic "${UNIONTYPE} mount failed"
 
     # Adding other custom mounts
     if [ -n "${PERSISTENT}" ]; then

diff --git a/scripts/live-bottom/02_timezone b/scripts/live-bottom/02_timezone
index bafc426..10b634e 100755 (executable)
--- a/scripts/live-bottom/02_timezone
+++ b/scripts/live-bottom/02_timezone
@@ -26,6 +26,20 @@ log_begin_msg "Setting timezone..."
 
 # live-initramfs script
 
-cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime
+if [ -n "${TIMEZONE}" ]; then
+    area="$(echo ${TIMEZONE} | cut -f1 -d '/')"
+    zone="$(echo ${TIMEZONE} | cut -f2 -d '/')"
+    chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+set tzdata/Areas $area
+set tzdata/Zones/$area $zone
+EOF
+    cp -f /root/usr/share/zoneinfo/${area}/${zone} /root/etc/localtime
+else
+    chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+set tzdata/Areas Etc
+set tzdata/Zones/Etc UTC
+EOF
+    cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime
+fi   
 
 log_end_msg

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index 389f53e..9c8bfd7 100755 (executable)
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -29,10 +29,16 @@ log_begin_msg "Configuring fstab..."
 FSTAB=/root/etc/fstab
 
 cat > $FSTAB <<EOF
-unionfs / unionfs rw 0 0
+${UNIONTYPE} / ${UNIONTYPE} rw 0 0
 tmpfs /tmp tmpfs nosuid,nodev 0 0
 EOF
 
-rm -f /root/etc/rcS.d/S*checkroot.sh
+# disabled for now
+#rm -f /root/etc/rcS.d/S*checkroot.sh
+
+if [ "${NOFASTBOOT}" != "Yes" ]
+then
+       touch root/fastboot
+fi
 
 log_end_msg