Adding live-initramfs 1.91.1-1.

11 files changed, 62 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 18ae2e6..40fcf7b 100644
--- a/Makefile
+++ b/Makefile
@@ -117,8 +117,8 @@ uninstall:
 update:
 	set -e; for MANPAGE in manpages/*.en.*; \
 	do \
-		sed -i	-e 's/2007\\-06\\-04/2007\\-06\\-11/' \
-			-e 's/1.88.1/1.90.1/' \
+		sed -i	-e 's/2007\\-06\\-11/2007\\-06\\-18/' \
+			-e 's/1.91.1/1.91.2/' \
 		$$MANPAGE; \
 	done
 
diff --git a/debian/changelog b/debian/changelog
index 18c85ef..f673bc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.91.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 18 Jun 2007 00:00:00 +0200
+
 live-initramfs (1.90.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/docs/CREDITS b/docs/CREDITS
index 00293a9..c10f802 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -16,3 +16,4 @@ Patches (alphabetical order):
   * Oliver Osburg <o.osburg@uni-jena.de>
   * Otavio Salvador <otavio@debian.org>
   * Sebastian Raveau <sebastien.raveau@epita.fr>
+  * Thomas Lange <lange@informatik.uni-koeln.de>
diff --git a/docs/ChangeLog b/docs/ChangeLog
index c281ef9..612ad0d 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,17 @@
+2007-06-17  Daniel Baumann  <daniel@debiann.org>
+
+	* Added patch from Thomas Lange <lange@informatik.uni-koeln.de> to
+	  properly load ide-generic after udev.
+
+2007-06-15  Daniel Baumann  <daniel@debian.org>
+
+	* Merging changes from casper 1.91.
+
+2007-06-14  Daniel Baumann  <daniel@debian.org>
+
+	* scripts/live-bottom/18hostname:
+	 - Appending to /etc/hosts to not overwrite custom settings.
+
 2007-06-08  Daniel Baumann  <daniel@debian.org>
 
 	* Merging changes from casper 1.88.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index c4174e6..e125fa4 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,11 @@
+casper (1.91) gutsy; urgency=low
+
+  * Fix Maintainer field (ubuntu-devel-discuss, not ubuntu-devel).
+  * Remember to strip directories from paths when dealing with driver update
+    .debs (LP: #120217).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 14 Jun 2007 09:51:33 +0100
+
 casper (1.90) gutsy; urgency=low
 
   * Added to 22screensaver, to stop the screen automatically locking.
diff --git a/hooks/live b/hooks/live
index e94590d..a2e5943 100755
--- a/hooks/live
+++ b/hooks/live
@@ -83,8 +83,8 @@ manual_add_modules nls_utf8
 manual_add_modules vfat
 
 # Hardware: cdrom
-force_load ide-generic
 manual_add_modules ide-cd
+manual_add_modules ide-generic
 manual_add_modules ohci1394
 manual_add_modules sbp2
 manual_add_modules sr_mod
diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7
index fb4a7d6..098882f 100644
--- a/manpages/live-initramfs.en.7
+++ b/manpages/live-initramfs.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-INITRAMFS 7 "2007\-06\-11" "1.90.1" "live\-initramfs"
+.TH LIVE\-INITRAMFS 7 "2007\-06\-18" "1.91.1" "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 737edee..7149aa0 100644
--- a/manpages/live-snapshot.en.1
+++ b/manpages/live-snapshot.en.1
@@ -1,4 +1,4 @@
-.TH LIVE\-SNAPSHOT 1 "2007\-06\-11" "1.90.1" "live\-initramfs"
+.TH LIVE\-SNAPSHOT 1 "2007\-06\-18" "1.91.1" "live\-initramfs"
 
 .SH NAME
 live\-snapshot \- a simple script to ease persistence usage
diff --git a/scripts/live-bottom/18hostname b/scripts/live-bottom/18hostname
index e854eb2..430d0a0 100755
--- a/scripts/live-bottom/18hostname
+++ b/scripts/live-bottom/18hostname
@@ -27,7 +27,7 @@ log_begin_msg "Setting hostname..."
 # live-initramfs script
 
 echo "$HOSTNAME" > /root/etc/hostname
-cat > /root/etc/hosts <<EOF
+cat >> /root/etc/hosts <<EOF
 127.0.0.1 localhost
 127.0.1.1 $HOSTNAME
 
diff --git a/scripts/live-bottom/40install_driver_updates b/scripts/live-bottom/40install_driver_updates
index 66ae123..d6f149a 100755
--- a/scripts/live-bottom/40install_driver_updates
+++ b/scripts/live-bottom/40install_driver_updates
@@ -38,8 +38,10 @@ cp -a /tmp/driver-updates/*.deb "/root$install_dir/"
 # We cannot leave packages in a bad state. So if the install fails, remove
 # it. This will get caught in live.log.
 for deb in "/root$install_dir"/*; do
-	if ! chroot /root dpkg -i "$install_dir/$deb"; then
-		chroot /root dpkg -P "${deb%%_*}"
+	[ -f "$deb" ] || continue
+	debbase="${deb##*/}"
+	if ! chroot /root dpkg -i "$install_dir/$debbase"; then
+	    chroot /root dpkg -P "${debbase%%_*}"
 	fi
 done
 
diff --git a/scripts/local-top/live b/scripts/local-top/live
new file mode 100755
index 0000000..7d9e6c2
--- /dev/null
+++ b/scripts/local-top/live
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+#set -e
+
+# initramfs-tools header
+
+PREREQ="udev"
+
+prereqs()
+{
+	echo "${PREREQ}"
+}
+
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+# live-initramfs script
+
+modprobe ide-generic