From 9109e956a9af4bb7fd0402376572278cf121c072 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 26 Jun 2010 10:28:40 +0100
Subject: [PATCH] Import patches-unapplied version 1.123 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: e6831e43211a602457c4f7b36a1c1e90665e6890

New changelog entries:
  * Make sure LIVE_BOOT_SCRIPTS is always defined.
  * Convert to source format 3.0 (native).
---
 debian/changelog     | 7 +++++++
 debian/source/format | 1 +
 livecd.sh            | 4 +++-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index 4e2ddcf5..0a5b9677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (1.123) maverick; urgency=low
+
+  * Make sure LIVE_BOOT_SCRIPTS is always defined.
+  * Convert to source format 3.0 (native).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 26 Jun 2010 10:28:40 +0100
+
 livecd-rootfs (1.122) maverick; urgency=low
 
   * livecd.sh don't set a variable to itself, especially when the variable
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000..89ae9db8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/livecd.sh b/livecd.sh
index 801c6627..efc40b9a 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -179,7 +179,9 @@ if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
 fi
 
 if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then
-       LIVE_BOOT_SCRIPTS="jasper"
+    LIVE_BOOT_SCRIPTS="jasper"
+else
+    LIVE_BOOT_SCRIPTS=
 fi
 
 for arg in "$@"; do