diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | docs/ChangeLog | 9 | ||||
| -rw-r--r-- | docs/parameters.txt | 2 | ||||
| -rwxr-xr-x | hooks/live | 6 | ||||
| -rw-r--r-- | manpages/live-initramfs.en.7 | 2 | ||||
| -rw-r--r-- | manpages/live-snapshot.en.1 | 2 | ||||
| -rwxr-xr-x | scripts/live-bottom/12fstab | 2 |
9 files changed, 29 insertions, 8 deletions
@@ -108,9 +108,9 @@ uninstall: update: set -e; for FILE in docs/parameters.txt manpages/*.en.*; \ do \ - sed -i -e 's/2007\\-08\\-20/2007\\-08\\-27/' \ - -e 's/20.08.2007/27.08.2007/' \ - -e 's/1.96.1/1.96.2/' \ + sed -i -e 's/2007\\-08\\-27/2007\\-09\\-03/' \ + -e 's/27.08.2007/03.09.2007/' \ + -e 's/1.96.2/1.96.3/' \ $$FILE; \ done diff --git a/debian/changelog b/debian/changelog index 12a51a4..b384977 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-initramfs (1.96.2-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Baumann <daniel@debian.org> Mon, 27 Aug 2007 00:00:00 +0200 + live-initramfs (1.96.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index d122176..adc35c9 100644 --- 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: all Depends: ${misc:Depends}, file, initramfs-tools, sudo, user-setup -Recommends: eject, live-initscripts +Recommends: eject, wget, live-initscripts Suggests: genext2fs, squashfs-tools Description: Debian Live initramfs hook live-initramfs is a hook for the initramfs-tools, used to generate a initramfs diff --git a/docs/ChangeLog b/docs/ChangeLog index 6d28a06..5969aec 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,12 @@ +2007-08-29 Daniel Baumann <daniel@debian.org> + + * scripts/live-bottom/12fstab: + - By default, we do not have fstab, so it is save to just append the + unionfs mount rather than overwritting it. + * hooks/live: + - Including wget if available. + * Uploaded 1.96.2-1. + 2007-08-21 Daniel Baumann <daniel@debian.org> * Merging changes from casper 1.96. diff --git a/docs/parameters.txt b/docs/parameters.txt index 032891e..5179360 100644 --- a/docs/parameters.txt +++ b/docs/parameters.txt @@ -1,7 +1,7 @@ Boot Parameters for Debian Live ------------------------------- -Updated for live-initramfs 1.96.1-1 on 2007-07-30. +Updated for live-initramfs 1.96.2-1 on 2007-07-30. These options (can be combined) work from the bootloader prompt: @@ -114,3 +114,9 @@ fi copy_exec /sbin/udevtrigger /sbin copy_exec /sbin/udevsettle /sbin copy_exec /usr/bin/udevinfo /bin + +# Program: wget +if [ -x /usr/bin/wget ] +then + copy_exec /usr/bin/wget /bin +fi diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7 index 923b054..d4577e9 100644 --- a/manpages/live-initramfs.en.7 +++ b/manpages/live-initramfs.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-INITRAMFS 7 "2007\-08\-20" "1.96.1" "live\-initramfs" +.TH LIVE\-INITRAMFS 7 "2007\-08\-27" "1.96.2" "live\-initramfs" .SH NAME live\-initramfs \- Debian Live initramfs hook diff --git a/manpages/live-snapshot.en.1 b/manpages/live-snapshot.en.1 index 7f7fe3f..4b873ed 100644 --- a/manpages/live-snapshot.en.1 +++ b/manpages/live-snapshot.en.1 @@ -1,4 +1,4 @@ -.TH LIVE\-SNAPSHOT 1 "2007\-08\-20" "1.96.1" "live\-initramfs" +.TH LIVE\-SNAPSHOT 1 "2007\-08\-27" "1.96.2" "live\-initramfs" .SH NAME live\-snapshot \- a simple script to ease persistence usage diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab index 9c8bfd7..b5b5602 100755 --- a/scripts/live-bottom/12fstab +++ b/scripts/live-bottom/12fstab @@ -28,7 +28,7 @@ log_begin_msg "Configuring fstab..." FSTAB=/root/etc/fstab -cat > $FSTAB <<EOF +cat >> $FSTAB << EOF ${UNIONTYPE} / ${UNIONTYPE} rw 0 0 tmpfs /tmp tmpfs nosuid,nodev 0 0 EOF |