Adding live-initramfs 1.91.5-1.

11 files changed, 99 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index a9b9991..c481eef 100644
--- a/Makefile
+++ b/Makefile
@@ -116,12 +116,12 @@ uninstall:
 	rm -f $(DESTDIR)/usr/share/man/man7/live-login.7.gz
 
 update:
-	set -e; for MANPAGE in manpages/*.en.*; \
+	set -e; for FILE in docs/parameters.txt manpages/*.en.*; \
 	do \
-		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; \
+		sed -i	-e 's/2007\\-07\\-16/2007\\-07\\-23/' \
+			-e 's/16.07.2007/23.07.2007/' \
+			-e 's/1.91.5/1.91.6/' \
+		$$FILE; \
 	done
 
 clean:
diff --git a/debian/changelog b/debian/changelog
index 5971009..17adc0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.91.5-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 16 Jul 2007 00:00:00 +0200
+
 live-initramfs (1.91.4-1) unstable; urgency=medium
 
   * New upstream release:
diff --git a/debian/init b/debian/init
index d515c39..d515c39 100755..100644
--- a/debian/init
+++ b/debian/init
diff --git a/debian/postinst b/debian/postinst
index 752b161..752b161 100755..100644
--- a/debian/postinst
+++ b/debian/postinst
diff --git a/debian/postrm b/debian/postrm
index 752b161..752b161 100755..100644
--- a/debian/postrm
+++ b/debian/postrm
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 6f8d95c..933ad53 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-18  Daniel Baumann  <daniel@debian.org>
+
+	* docs/parameters.txt:
+	  - Added values for vga parameter.
+	* scripts/live:
+	  - Added patch from Thomas Lange <lange@informatik.uni-koeln.de> to
+	    respect rootserver name from dhcp.
+	* Uploaded 1.91.5-1.
+
 2007-07-12  Daniel Baumann  <daniel@debian.org>
 
 	* bin/live-snapshot, scripts/live:
diff --git a/docs/parameters.txt b/docs/parameters.txt
new file mode 100644
index 0000000..2399772
--- /dev/null
+++ b/docs/parameters.txt
@@ -0,0 +1,67 @@
+Boot Parameters for Debian Live
+-------------------------------
+
+Updated for live-initramfs 1.91.5-1 on 2007-07-23.
+
+These options (can be combined) work from the syslinux bootprompt:
+
+live access=ACCESS
+live console=TTY,SPEED
+live debug
+live hostname=HOSTNAME
+live username=USER
+live userfullname=USERFULLNAME
+live integrity-check
+live ip=[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF]  [,[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF]]*
+live ip[=frommedia]
+live {keyb|kbd-chooser/method}=KEYBOARD
+live {klayout|console-setup/layoutcode}=LAYOUT
+live {kvariant|console-setup/variantcode}=VARIANT
+live {kmodel|console-setup/modelcode}=CODE
+live koptions=OPTIONS
+live live-getty
+live {live-media|bootfrom}=DEVICE
+live {live-media-encryption|encryption}=TYPE
+live live-media-offset=BYTES
+live live-media-timeout=SECONDS
+live {locale|debian-installer/locale}=LOCALE
+live module=NAME
+live netboot[=nfs|cifs]
+live nfsopts=
+live noautologin
+live noxautologin
+live nofastboot
+live nopersistent
+live nosudo
+live noswap
+live persistent
+live {preseed/file|file}=FILE
+live package/question=VALUE
+live quickreboot
+live showmounts
+live timezone=TIMEZONE
+live todisk=DEVICE
+live toram
+live union=unionfs|aufs
+live xdebconf
+live xvideomode=RESOLUTION
+
+Values for the vga kernel parameter:
+
+Colours   640x400 640x480 800x600 1024x768 1152x864 1280x1024 1600x1200
+--------+--------------------------------------------------------------
+ 4 bits |    ?       ?     0x302      ?        ?        ?         ?
+ 8 bits |  0x300   0x301   0x303    0x305    0x161    0x307     0x31C
+15 bits |    ?     0x310   0x313    0x316    0x162    0x319     0x31D
+16 bits |    ?     0x311   0x314    0x317    0x163    0x31A     0x31E
+24 bits |    ?     0x312   0x315    0x318      ?      0x31B     0x31F
+32 bits |    ?       ?       ?        ?      0x164      ?
+
+Colours   640x400 640x480 800x600 1024x768 1152x864 1280x1024 1600x1200
+--------+--------------------------------------------------------------
+ 4 bits |    ?       ?      770       ?        ?        ?         ?
+ 8 bits |   768     769     771      773      353      775       796
+15 bits |    ?      784     787      790      354      793       797
+16 bits |    ?      758     788      791      355      794       798
+24 bits |    ?      786     789      792       ?       795       799
+32 bits |    ?       ?       ?        ?       356       ?
diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7
index b44467e..ddcaccb 100644
--- a/manpages/live-initramfs.en.7
+++ b/manpages/live-initramfs.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-INITRAMFS 7 "2007\-07\-09" "1.91.4" "live\-initramfs"
+.TH LIVE\-INITRAMFS 7 "2007\-07\-16" "1.91.5" "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 05c1221..f4d7078 100644
--- a/manpages/live-snapshot.en.1
+++ b/manpages/live-snapshot.en.1
@@ -1,4 +1,4 @@
-.TH LIVE\-SNAPSHOT 1 "2007\-07\-09" "1.91.4" "live\-initramfs"
+.TH LIVE\-SNAPSHOT 1 "2007\-07\-16" "1.91.5" "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
index 80fd34b..8866a40 100644
--- a/manpages/live-snapshot.it.1
+++ b/manpages/live-snapshot.it.1
@@ -59,7 +59,7 @@ da informazioni sulla versione ed esce
 Questo programma fa parte di live\-initramfs.
 
 .SH BUGS
-Riportate i bug sul pacchetto live\-initramfs <\fIhttp://packages.qa.debian.org/live\-initramfs/\fR>.
+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>.
@@ -67,4 +67,4 @@ Ulteriori informazioni su progetto Debian Live possono essere trovate su <\fIhtt
 .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>.
+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 35ba702..5b70b6a 100755
--- a/scripts/live
+++ b/scripts/live
@@ -397,6 +397,14 @@ do_netmount() {
         NFSROOT=${ROOTSERVER}:${ROOTPATH}
     fi
 
+    # source relevant ipconfig output
+    . /tmp/net-${DEVICE}.conf
+    export HOSTNAME
+
+    if [ "${NFSROOT#*:}" = "$NFSROOT" ]; then
+	NFSROOT=${ROOTSERVER}:${NFSROOT}
+    fi
+
     [ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}"
 
     if [ "${NETBOOT}" != "nfs" ] && do_cifsmount ; then