diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | docs/ChangeLog | 12 | ||||
| -rw-r--r-- | docs/parameters.txt | 4 | ||||
| -rw-r--r-- | manpages/live-initramfs.en.7 | 2 | ||||
| -rw-r--r-- | manpages/live-snapshot.en.1 | 2 | ||||
| -rwxr-xr-x | scripts/live | 6 | ||||
| -rwxr-xr-x | scripts/live-bottom/02timezone (renamed from scripts/live-bottom/02_timezone) | 0 |
8 files changed, 30 insertions, 10 deletions
@@ -7,7 +7,7 @@ TRANSLATIONS="it" all: build test: - set -e; for SCRIPT in hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*; \ + set -e; for SCRIPT in bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*; \ do \ sh -n $$SCRIPT; \ done @@ -108,9 +108,9 @@ uninstall: update: set -e; for FILE in docs/parameters.txt manpages/*.en.*; \ do \ - sed -i -e 's/2007\\-07\\-30/2007\\-08\\-06/' \ - -e 's/30.07.2007/06.08.2007/' \ - -e 's/1.95.1/1.95.2/' \ + sed -i -e 's/2007\\-08\\-13/2007\\-08\\-20/' \ + -e 's/13.08.2007/20.08.2007/' \ + -e 's/1.95.3/1.95.4/' \ $$FILE; \ done diff --git a/debian/changelog b/debian/changelog index a6e96cd..a2b6834 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-initramfs (1.95.3-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Baumann <daniel@debian.org> Mon, 13 Aug 2007 00:00:00 +0200 + live-initramfs (1.95.2-1) unstable; urgency=medium * New upstream release. diff --git a/docs/ChangeLog b/docs/ChangeLog index 32fa652..ac88a8d 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,15 @@ +2007-08-21 Daniel Baumann <daniel@debian.org> + + * scripts/live: + - Applied patch from Jesse W. Hathaway <jesse@mbuki-mvuki.org> to + not use nfsro with kernels larger than 2.6.22 (where unionfs 2.x + is supposed to be available soon). + * Uploaded 1.95.3-1. + +2007-08-11 Daniel Baumann <daniel@debian.org> + + * Uploaded 1.95.2-1. + 2007-08-01 Daniel Baumann <daniel@debian.org> * scripts/live-bottom/10adduser: diff --git a/docs/parameters.txt b/docs/parameters.txt index f8a0e72..8c2e13b 100644 --- a/docs/parameters.txt +++ b/docs/parameters.txt @@ -1,9 +1,9 @@ Boot Parameters for Debian Live ------------------------------- -Updated for live-initramfs 1.95.2-1 on 2007-07-30. +Updated for live-initramfs 1.95.3-1 on 2007-07-30. -These options (can be combined) work from the syslinux bootprompt: +These options (can be combined) work from the bootloader prompt: live access=ACCESS live console=TTY,SPEED diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7 index ab92697..e0a61e1 100644 --- a/manpages/live-initramfs.en.7 +++ b/manpages/live-initramfs.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-INITRAMFS 7 "2007\-08\-06" "1.95.2" "live\-initramfs" +.TH LIVE\-INITRAMFS 7 "2007\-08\-13" "1.95.3" "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 d5f56a4..8c62c13 100644 --- a/manpages/live-snapshot.en.1 +++ b/manpages/live-snapshot.en.1 @@ -1,4 +1,4 @@ -.TH LIVE\-SNAPSHOT 1 "2007\-08\-06" "1.95.2" "live\-initramfs" +.TH LIVE\-SNAPSHOT 1 "2007\-08\-13" "1.95.3" "live\-initramfs" .SH NAME live\-snapshot \- a simple script to ease persistence usage diff --git a/scripts/live b/scripts/live index 97777bd..a73da84 100755 --- a/scripts/live +++ b/scripts/live @@ -635,8 +635,10 @@ setup_unionfs() { # Let's just mount the read-only file systems first rofsstring="" rofslist="" - if [ "${NETBOOT}" = "nfs" ] ; then - roopt="nfsro" # go aroung a bug in nfs-unionfs locking + minor_kernel_version=`uname -r|cut -c 5-|sed 's/[^0-9].*//'` + if [ "${NETBOOT}" = "nfs" ] && [ "${minor_kernel_version}" -lt 22 ]; then + # go aroung a bug in nfs-unionfs locking for unionfs <= 1.4 + roopt="nfsro" else roopt="ro" fi diff --git a/scripts/live-bottom/02_timezone b/scripts/live-bottom/02timezone index dad3cad..dad3cad 100755 --- a/scripts/live-bottom/02_timezone +++ b/scripts/live-bottom/02timezone |