Adding debian version 3.0~a1-1.

7 files changed, 25 insertions, 185 deletions

diff --git a/debian/changelog b/debian/changelog
index 4b078bd..f8e9c8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,155 +1,10 @@
-live-boot (2.0.15-1) unstable; urgency=low
+live-boot (3.0~a1-1) experimental; urgency=low
 
-  [ Daniel Baumann ]
-  * Adding live-system script from live-tools.
-  * Updating year in copyright.
-
-  [ Marco Amadori ]
-  * Adjust copyright entry in live-snapshot.
-
- -- Daniel Baumann <daniel@debian.org>  Tue, 01 Feb 2011 22:49:03 +0100
-
-live-boot (2.0.14-1) unstable; urgency=low
-
-  [ Steven Shiau ]
-  * Removing the duplicated "the" in the live-boot.init script.
-
-  [ Daniel Baumann ]
-  * Correcting live hook to include mtdblock for syslinux memdisk usage,
-    thanks to Michael Prokop <mika@grml.org>.
-  * Supporting /dev/mtdblock0 as valid device name (for memdisk boot),
-    thanks to Michael Prokop <mika@grml.org>.
-
- -- Daniel Baumann <daniel@debian.org>  Fri, 24 Dec 2010 18:51:57 +0100
-
-live-boot (2.0.13-1) unstable; urgency=medium
-
-  [ Ronny Standtke ]
-  * Remounting cow read-only before prompting user to remove usb flash
-    drive.
-
- -- Daniel Baumann <daniel@debian.org>  Mon, 06 Dec 2010 11:18:32 +0100
-
-live-boot (2.0.12-1) unstable; urgency=medium
-
-  [ T(A)ILS developers ]
-  * Fixing fromiso= on Squeeze.
-
- -- Daniel Baumann <daniel@debian.org>  Mon, 22 Nov 2010 23:27:01 +0100
-
-live-boot (2.0.11-1) unstable; urgency=medium
-
-  * Removing deep link to bug page in the manual, since we don't have
-    stable references yet.
-
- -- Daniel Baumann <daniel@debian.org>  Thu, 28 Oct 2010 09:22:02 +0200
-
-live-boot (2.0.10-1) unstable; urgency=medium
-
-  * Don't do anything in initscript when using toram (Closes: #601575).
-
- -- Daniel Baumann <daniel@debian.org>  Wed, 27 Oct 2010 14:54:58 +0200
-
-live-boot (2.0.9-1) unstable; urgency=low
-
-  [ T(A)ILS developers ]
-  * Fixing overzealous blacklist usage.
-  * Adding documentation for persistent=cryptsetup in the manpage.
-
- -- Daniel Baumann <daniel@debian.org>  Tue, 26 Oct 2010 09:15:54 +0200
-
-live-boot (2.0.8-1) unstable; urgency=medium
-
-  [ amnesia ]
-  * Adding live-snapshot.list documentation to manpage.
-
- -- Daniel Baumann <daniel@debian.org>  Tue, 12 Oct 2010 11:20:12 +0200
-
-live-boot (2.0.7-1) unstable; urgency=medium
-
-  [ Michal Suchanek ]
-  * Adding initial support for unionmount.
-
-  [ Marco Amadori ]
-  * Included a note about persistent-subtext (Helps: #536728).
-
-  [ Daniel Baumann ]
-  * Running manpage rebuild after manpage updates.
-
- -- Daniel Baumann <daniel@debian.org>  Sat, 02 Oct 2010 10:06:41 +0200
-
-live-boot (2.0.6-1) unstable; urgency=medium
-
-  [ intrigeri ]
-  * Fixing find_snap to take its second argument into account.
-
- -- Daniel Baumann <daniel@debian.org>  Sat, 25 Sep 2010 22:48:35 +0200
-
-live-boot (2.0.5-1) unstable; urgency=low
-
-  [ Marco Amadori ]
-  * Fix snapshots' sync-strings usage (Closes: #591330).
-  * Fixed some snapshot related debug messages.
-  * Added support for empty (initial) snapshots.
-
-  [ Daniel Baumann ]
-  * Adding patch from Colin Watson <cjwatson@ubuntu.com> to follow
-    symlinks when checking for dynamically linked files at reboot in
-    initscript.
-
- -- Daniel Baumann <daniel@debian.org>  Tue, 14 Sep 2010 08:55:02 +0200
-
-live-boot (2.0.4-1) unstable; urgency=low
-
-  [ Daniel Baumann ]
-  * Applying patch from Luke Yelavich <themuso@ubuntu.com> to instead of
-    mangling the main sudoers file in accessibility bottom script,
-    create a new file in /etc/sudoers.d and set permissions
-    appropriately.
-  * Applying patch from Michael Casadevall <mcasadevall@ubuntu.com> to
-    add platform-sata_mv to is_nice_device() to allow Marvell Dove A0
-    and AVD1 to properly boot live media.
-  * Updating uinstall targets in makefile.
-
-  [ Steven Shiau ]
-  * Allowing to assign no gateway in networking bottom script.
-
-  [ Daniel Baumann ]
-  * Removing usplash support from initscript, usplash is dead.
-  * Removing usplash support in initramfs, usplash is dead.
-  * Adding plymouth in bug script.
-
- -- Daniel Baumann <daniel@debian.org>  Mon, 06 Sep 2010 15:21:24 +0200
-
-live-boot (2.0.3-1) unstable; urgency=low
-
-  * Exiting with 0 in live-boot bug script (Closes: #595262).
-  * Using boot.d instead of boot.conf.d as directory name for custom
-    configuration files.
-
- -- Daniel Baumann <daniel@debian.org>  Thu, 02 Sep 2010 22:43:03 +0200
-
-live-boot (2.0.2-1) unstable; urgency=low
-
-  * Updating seperators in networking bottom script to fix ip parameter
-    parsing (Closes: #590494).
-  * Updating live-build reference in manpages.
-  * Checking for file existence in initramfs hook (Closes: #595264).
-  * Adding live-toram script to copy the running live system to ram and
-    eject the live media.
-
- -- Daniel Baumann <daniel@debian.org>  Thu, 02 Sep 2010 18:25:12 +0200
-
-live-boot (2.0.1-1) unstable; urgency=low
-
-  [ Michael Prokop ]
-  * Adding workaround for aufs issue in kernel versions around 2.6.33.
-
-  [ Daniel Baumann ]
-  * Using allow-hotplug instead of auto in automatically created
-    /etc/network/interfaces file.
+  * Switching to source format 3.0 (quilt).
+  * Removing live-initramfs transitional package.
+  * Removing lenny support.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 01 Sep 2010 18:25:08 +0200
+ -- Daniel Baumann <daniel@debian.org>  Tue, 10 Aug 2010 02:02:39 +0200
 
 live-boot (2.0.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 79305d6..bbdc294 100644
--- a/debian/control
+++ b/debian/control
@@ -25,23 +25,11 @@ Package: live-boot-initramfs-tools
 Architecture: all
 Depends:
  ${misc:Depends}, busybox | busybox-initramfs, initramfs-tools, udev
-Conflicts: live-boot-backend, live-initramfs (<< 2.0~a1)
-Replaces: live-boot-backend, live-initramfs
+Conflicts: live-boot-backend
+Replaces: live-boot-backend
 Provides: live-boot-backend
 Description: Debian Live - System Boot Scripts (initramfs-tools backend)
  live-boot contains the scripts that configure a Debian Live system during the
  boot process (early userspace).
  .
  This package contains the initramfs-tools backend.
-
-Package: live-initramfs
-Architecture: all
-Depends:
- ${misc:Depends}, live-boot, live-boot-initramfs-tools, live-config,
- live-config-sysvinit
-Description: Debian Live - System Boot Scripts (transitional package)
- Package to ease upgrading from older live-initramfs packages to the new
- live-boot-initramfs-tools package.
- .
- This package can be purged at anytime once the live-boot-initramfs-tools
- package has been installed.
diff --git a/debian/copyright b/debian/copyright
index e4e40db..f9c27e6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Homepage: http://live.debian.net/
 
 Files: *
 Copyright:
- (C) 2007-2011 Daniel Baumann <daniel@debian.org>
+ (C) 2007-2010 Daniel Baumann <daniel@debian.org>
  (C) 2005-2008 Canonical Ltd. <http://www.cannonical.com/>
  (C) 2008 Chris Lamb <chris@debian.org>
  (C) 2006-2007 Marco Amadori <marco.amadori@gmail.com>
diff --git a/debian/live-boot.bug-presubj b/debian/live-boot.bug-presubj
index 8b18276..9845fae 100644
--- a/debian/live-boot.bug-presubj
+++ b/debian/live-boot.bug-presubj
@@ -1,7 +1,7 @@
 Before submitting a bug report against live-boot, please make sure
 that you have read our guidlines for Debian Live bug reports:
 
-  http://live.debian.net/manual/
+  http://live.debian.net/manual/html/bugs.html
 
 By providing the required information as outlined in the guidlines makes
 sure that we can optimally reproduce and fix bugs, not doing so wastes a
diff --git a/debian/live-boot.bug-script b/debian/live-boot.bug-script
index 385770c..d56b035 100644
--- a/debian/live-boot.bug-script
+++ b/debian/live-boot.bug-script
@@ -10,6 +10,4 @@ dpkg -l eject uuid-runtime wget
 dpkg -l loop-aes-utils curlftpfs genext2fs httpfs2 squashfs-tools mtd-tools
 
 # Checking other packages
-dpkg -l cryptsetup plymouth
-
-exit 0
+dpkg -l cryptsetup splashy usplash
diff --git a/debian/live-boot.init b/debian/live-boot.init
index 6d90059..12d0f94 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -21,13 +21,12 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
 NAME=live-boot
 SCRIPTNAME=/etc/init.d/${NAME}
 DO_SNAPSHOT=/sbin/live-snapshot
-SNAPSHOT_CONF="/etc/live/boot.d/snapshot.conf"
 
 # Exit if system was not booted by live-boot
 grep -qs boot=live /proc/cmdline || exit 0
 
-# Read snapshot configuration variables
-[ -r ${SNAPSHOT_CONF} ] && . ${SNAPSHOT_CONF}
+# Read configuration variable file if it is present
+[ -r /etc/live.conf ] && . /etc/live.conf
 
 # Load the VERBOSE setting and other rcS variables
 [ -f /etc/default/rcS ] && . /etc/default/rcS
@@ -49,7 +48,7 @@ cache_path()
 	then
 		if [ -x "${path}" ]
 		then
-			if file -L "${path}" | grep -q 'dynamically linked'
+			if file "${path}" | grep -q 'dynamically linked'
 			then
 				for lib in $(ldd "${path}" | awk '{ print $3 }')
 				do
@@ -97,7 +96,6 @@ do_stop ()
 {
 	if ! grep -qs nopersistent /proc/cmdline && grep -qs persistent /proc/cmdline
 	then
-		# ROOTSNAP and HOMESNAP are defined in ${SNAPSHOT_CONF} file
 		if [ ! -z "${ROOTSNAP}" ]
 		then
 			${DO_SNAPSHOT} --resync-string="${ROOTSNAP}"
@@ -115,12 +113,6 @@ do_stop ()
 		return 0
 	fi
 
-	# check for toram
-	if grep -qs toram /proc/cmdline
-	then
-		return 0
-	fi
-
 	# Don't prompt to eject the SD card on Babbage board, where we reuse it
 	# as a quasi-boot-floppy. Technically this uses a bit of ubiquity
 	# (archdetect), but since this is mostly only relevant for
@@ -142,7 +134,7 @@ do_stop ()
 		prompt=
 	fi
 
-	for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth
+	for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth /sbin/usplash_write
 	do
 		cache_path "${path}"
 	done
@@ -156,8 +148,6 @@ do_stop ()
 		esac
 	done
 
-	mount -o remount,ro /live/cow
-
 	if [ -z ${QUICKREBOOT} ]
 	then
 
@@ -175,7 +165,7 @@ do_stop ()
 			MESSAGE="Please remove the USB flash drive"
 		else
 			# ejecting is a very good idea here
-			MESSAGE="Please remove the disc, close the tray (if any)"
+			MESSAGE="Please remove the disc, close the the tray (if any)"
 
 			if [ -x /usr/bin/eject ]
 			then
@@ -195,6 +185,13 @@ do_stop ()
 
 			printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
 
+			if [ -x /sbin/usplash_write ]
+			then
+				/sbin/usplash_write "TIMEOUT 86400"
+				/sbin/usplash_write "TEXT-URGENT ${MESSAGE}"
+				/sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
+			fi
+
 			read x < /dev/console
 		fi
 	fi
@@ -225,6 +222,8 @@ case "${1}" in
 				[ "${VERBOSE}" != no ] && log_end_msg 1
 				;;
 		esac
+
+		mount -o remount,ro /live/cow
 		;;
 
 	*)
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)