[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH][live-installer] Restore support for casper



Hello,

 Please accept this patch to live-installer which re-adds support for casper making live-installer work on Ubuntu again.

Cheers,

--
Cody A.W. Somerville
Software Systems Release Engineer
Foundations Team
Custom Engineering Solutions Group
Canonical OEM Services
Phone: +1-781-850-2087
Cell: +1-613-401-5141
Email: cody.somerville@canonical.com
diff -Nru live-installer-13/debian/changelog live-installer-14/debian/changelog
--- live-installer-13/debian/changelog	2009-08-19 16:56:58.000000000 -0400
+++ live-installer-14/debian/changelog	2010-01-12 20:08:17.000000000 -0500
@@ -1,3 +1,13 @@
+live-installer (14) unstable; urgency=low
+
+  * support/dir,
+     support/extX, support/squashfs,
+     live-initramfs.d/remove-packages,
+     debian/live-installer.postinst: 
+    - Re-add support for casper.
+
+ -- Cody A.W. Somerville <cody.somerville@canonical.com>  Tue, 12 Jan 2010 20:08:10 -0500
+
 live-installer (13) unstable; urgency=low
 
   [ Daniel Baumann ]
diff -Nru live-installer-13/debian/live-installer.postinst live-installer-14/debian/live-installer.postinst
--- live-installer-13/debian/live-installer.postinst	2009-08-04 20:19:15.000000000 -0400
+++ live-installer-14/debian/live-installer.postinst	2010-01-12 20:06:06.000000000 -0500
@@ -74,6 +74,13 @@
 
 	# if we're dumping it, we need to set the boot mode
 	if [ "$mode" = live ]; then
+		# which init script to use
+		if [ -d /cdrom/casper ]; then
+			bootmode="casper"
+		else
+			bootmode="live plainroot"
+		fi
+
 		kopts=
 		if db_get debian-installer/add-kernel-opts && [ "$RET" ]; then
 			kopts="$RET"
@@ -81,7 +88,7 @@
 			kopts="$(echo "$kopts" | sed -r "s/(^| )boot=[^ ]*//")"
 		fi
 		db_set debian-installer/add-kernel-opts \
-			"${kopts:+$kopts }boot=live plainroot"
+			"${kopts:+$kopts }boot=$bootmode"
 
 		# skip the hooks
 		return
diff -Nru live-installer-13/live-installer.d/remove-packages live-installer-14/live-installer.d/remove-packages
--- live-installer-13/live-installer.d/remove-packages	2009-08-04 20:19:15.000000000 -0400
+++ live-installer-14/live-installer.d/remove-packages	2010-01-12 20:00:24.000000000 -0500
@@ -1,6 +1,15 @@
 #!/bin/sh -e
 
-in-target apt-get --yes remove --purge live-initramfs
-if [ -f /target/var/lib/dpkg/live-initscripts.list ]; then
-	in-target apt-get --yes remove --purge live-initscripts
+# live-initramfs
+if [ -d /cdrom/live ]; then
+	in-target apt-get --yes remove --purge live-initramfs
+	if [ -f /target/var/lib/dpkg/live-sysvinit.list ]; then
+		in-target apt-get --yes remove --purge live-sysvinit
+	fi
+fi
+
+# casper
+if [ -d /cdrom/casper ]; then
+	in-target apt-get --yes remove --purge casper
+	in-target update-initramfs -k all -u
 fi
diff -Nru live-installer-13/support/dir live-installer-14/support/dir
--- live-installer-13/support/dir	2009-08-04 20:19:15.000000000 -0400
+++ live-installer-14/support/dir	2010-01-12 19:58:08.000000000 -0500
@@ -1,6 +1,9 @@
 #!/bin/sh -e
 
+# live-initramfs
 PLACES="$PLACES /cdrom/live/filesystem.dir"
+# casper
+PLACES="$PLACES /cdrom/casper/filesystem.dir"
 
 dir_prepare() {
 	cd $place
diff -Nru live-installer-13/support/extX live-installer-14/support/extX
--- live-installer-13/support/extX	2009-08-04 20:19:15.000000000 -0400
+++ live-installer-14/support/extX	2010-01-12 19:57:53.000000000 -0500
@@ -1,6 +1,9 @@
 #!/bin/sh -e
 
+# live-initramfs
 PLACES="$PLACES /cdrom/live/filesystem.ext2 /cdrom/live/filesystem.ext3 /cdrom/live/filesystem.ext4"
+# casper
+PLACES="$PLACES /cdrom/casper/filesystem.ext2 /cdrom/casper/filesystem.ext3 /cdrom/casper/filesystem.ext4"
 
 extX_prepare() {
 	modprobe $1 || true
diff -Nru live-installer-13/support/squashfs live-installer-14/support/squashfs
--- live-installer-13/support/squashfs	2009-08-04 20:19:15.000000000 -0400
+++ live-installer-14/support/squashfs	2010-01-12 19:57:40.000000000 -0500
@@ -1,6 +1,9 @@
 #!/bin/sh -e
 
+# live-initramfs
 PLACES="$PLACES /cdrom/live/filesystem.squashfs"
+# casper
+PLACES="$PLACES /cdrom/casper/filesystem.squashfs"
 
 squashfs_prepare() {
 	modprobe squashfs || true

Reply to: