Adding casper 1.71+debian-1.

11 files changed, 125 insertions, 15 deletions

diff --git a/debian/casper.init b/debian/casper.init
index c69e387..ae1a1a4 100644
--- a/debian/casper.init
+++ b/debian/casper.init
@@ -64,11 +64,11 @@ do_stop ()
 	eject -p -m /live_media >/dev/null 2>&1
 
 	# XXX - i18n
-	echo -n "Please remove the disc and close the tray (if any) then press ENTER: "
+	echo "Please remove the disc and close the tray (if any) then press ENTER: "
 	if [ -x /sbin/usplash_write ]; then
-		/sbin/usplash_write "TIMEOUT 0"
-		/sbin/usplash_write "TEXT Please remove the disc, close the tray (if any)"
-		/sbin/usplash_write "TEXT and press ENTER to continue"
+		/sbin/usplash_write "TIMEOUT 86400"
+		/sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)"
+		/sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
 	fi
 
 	read x < /dev/console
@@ -76,8 +76,10 @@ do_stop ()
 
 case "$1" in
 	start|restart|reload|force-reload|status)
+		[ "$VERBOSE" != no ] && log_end_msg 0
 		;;
 	stop)
+		log_begin_msg "Caching reboot files..."
 		do_stop
 		case "$?" in
 			0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
@@ -85,7 +87,7 @@ case "$1" in
 		esac
 		;;
 	*)
-		echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+		log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
 		exit 3
 		;;
 esac
diff --git a/debian/casper.install b/debian/casper.install
index 436f6d2..13d8134 100644
--- a/debian/casper.install
+++ b/debian/casper.install
@@ -2,5 +2,6 @@ bin/casper-getty		sbin
 bin/casper-login		sbin
 bin/casper-preseed		usr/share/casper
 bin/casper-reconfigure		usr/share/casper
+bin/casper-snapshot		sbin
 hooks				usr/share/initramfs-tools
 scripts				usr/share/initramfs-tools
diff --git a/debian/casper.manpages b/debian/casper.manpages
index c16a42d..c455a7e 100644
--- a/debian/casper.manpages
+++ b/debian/casper.manpages
@@ -1 +1,2 @@
 debian/manpage/casper.7
+debian/manpage/casper-snapshot.1
diff --git a/debian/changelog b/debian/changelog
index e930683..888457b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+casper (1.71+debian-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added experimental casper-snapshot script and manpage.
+  * Tagged for debtags project.
+
+ -- Marco Amadori <marco.amadori@gmail.com>  Thu, 28 Sep 2006 16:04:54 +0200
+
 casper (1.68+debian-3) unstable; urgency=low
 
   * Really add casper manpage (Closes: #389867).
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index 0f50d72..e9288e9 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -1,8 +1,39 @@
-casper (1.69) UNRELEASED; urgency=low
+casper (1.71) edgy; urgency=low
 
+  * Use TEXT-URGENT in shutdown script to make sure we display the "please
+    remove disc and press enter" text.  Malone: #61533
+  * Increase usplash timeout since "TIMEOUT 0" no longer means "spin
+    forever".
+  * Don't move-mount all the squashfs-es into / since that confuses mono
+    (and some other apps too).  Malone: #62756
+  * Disable kwallet by default.  Malone: #47743
+  * Add -n to language selector to make it not whine about
+    not-fully-installed langpacks.  Malone. #37568
+  * Override definition of log_end_msg in casper-functions.  Make sure all
+    casper-bottom scripts use this.
+  * Pulsate bar in casper-top and casper-bottom.  Malone: #61535
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed,  4 Oct 2006 09:52:06 +0200
+
+casper (1.70) edgy; urgency=low
+
+  * Check for new file= alias as well as preseed/file= (closes: Malone
+    #63145).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed,  4 Oct 2006 08:59:53 +0100
+
+casper (1.69) edgy; urgency=low
+
+  [ Tollef Fog Heen ]
   * Use grep -E in scripts/casper. Malone: #57620
+  * Fix syntax error in accessibility script
+
+  [ Colin Watson ]
+  * Run 'sh -n' over everything in build target to avoid future syntax
+    errors.
+  * Fix check for /etc/default/console-setup (closes: Malone #62775).
 
- -- Tollef Fog Heen <tfheen@ubuntu.com>  Mon, 25 Sep 2006 14:54:57 +0200
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon,  2 Oct 2006 10:58:19 +0100
 
 casper (1.68) edgy; urgency=low
 
diff --git a/debian/control b/debian/control
index 34be909..1999790 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Depends: initramfs-tools (>= 0.40), user-setup, sudo
 Conflicts: usplash (<< 0.4-27)
 Recommends: live-package
 Suggests: dmsetup
+Tag: admin::boot, admin::filesystem, implemented-in::shell, protocol::smb, role::plugin, scope::utility, special::completely-tagged, works-with-format::iso9660
 Description: Debian Live initramfs generator
  Casper provides an initramfs generator suited for booting a Debian Live systems
  from read only media. Useful to build live CDs.
diff --git a/debian/control.debian b/debian/control.debian
index 34be909..1999790 100644
--- a/debian/control.debian
+++ b/debian/control.debian
@@ -12,6 +12,7 @@ Depends: initramfs-tools (>= 0.40), user-setup, sudo
 Conflicts: usplash (<< 0.4-27)
 Recommends: live-package
 Suggests: dmsetup
+Tag: admin::boot, admin::filesystem, implemented-in::shell, protocol::smb, role::plugin, scope::utility, special::completely-tagged, works-with-format::iso9660
 Description: Debian Live initramfs generator
  Casper provides an initramfs generator suited for booting a Debian Live systems
  from read only media. Useful to build live CDs.
diff --git a/debian/control.ubuntu b/debian/control.ubuntu
index 6767acc..77c9cb2 100644
--- a/debian/control.ubuntu
+++ b/debian/control.ubuntu
@@ -11,6 +11,7 @@ Section: misc
 Priority: extra
 Depends: initramfs-tools (>= 0.40ubuntu11), dmsetup, user-setup, sudo
 Conflicts: usplash (<< 0.4-27)
+Tag: admin::boot, admin::filesystem, implemented-in::shell, protocol::smb, role::plugin, scope::utility, special::completely-tagged, works-with-format::iso9660
 Description: Run a "live" preinstalled system from read-only media
 
 Package: ubiquity-casper
@@ -19,6 +20,7 @@ Depends: laptop-detect, sudo
 Conflicts: espresso-casper
 Replaces: espresso-casper
 Enhances: ubiquity
+Tag: admin::boot, admin::filesystem, implemented-in::shell, protocol::smb, role::plugin, scope::utility, special::completely-tagged, works-with-format::iso9660
 Description: Configuration hooks for live installer
  This package provides hook scripts for the Ubiquity live installer that
  repeat some pieces of configuration done by the live system boot process in
diff --git a/debian/manpage/casper-snapshot.1 b/debian/manpage/casper-snapshot.1
new file mode 100644
index 0000000..1e17251
--- /dev/null
+++ b/debian/manpage/casper-snapshot.1
@@ -0,0 +1,55 @@
+.TH "CASPER-SNAPSHOT" 1 "Thu,  28 Sep 2006" "0.0.1" "User commands"
+
+.SH NAME
+casper-snapshot \- a simple script to ease persistence usage.
+
+.SH SYNOPSIS
+.B casper-snapshot
+.RB [\| \-c \||\| \-\-cow
+.IR DIRECTORY \|]
+.RB [\| \-d \||\| \-\-destination
+.IR DIRECTORY \||\| FILE \|]
+.RB [\| \-o \||\| \-\-output
+.IR FILE \|]
+.RB [\| \-t \||\| \-\-type
+.IR TYPE \|]
+.PP
+.B make-live
+.RB \-h \||\| \-\-help
+.br
+.B make-live
+.RB \-u \||\| \-\-usage
+.br
+.B make-live
+.RB \-v \||\| \-\-version
+
+.SH DESCRIPTION
+Casper-snapshot is a script useful to build the right types of persistent image files supported by casper.
+
+.SH OPTIONS
+.TP
+.BI "\-c, \-\-cow" DIRECTORY
+specifies the input directory to be cloned in the image file.
+This parameters often does not need to be specified as the default of "/cow" for it should be right for most uses, however it could be handy to specify "/home" and type ext2 for the type to prepare an image file suited to be directly mounted by casper as home.
+.TP
+.BI "\-d, \-\-destination" DIRECTORY
+.TP
+.BI "\-o, \-\-output" FILE
+.TP
+.BI "\-t, \-\-type" TYPE
+
+.SH BUGS
+.B casper-snapshot
+Time (and BTS) will tell.
+
+.SH HOMEPAGE
+Debian Live project <http://live.debian.net/>
+
+.SH SEE ALSO
+.BR casper(7)
+
+.SH AUTHOR
+casper-snapshot was written Marco Amadori <marco.amadori@gmail.com>.
+.TP
+This manual page was written by Marco Amadori <marco.amadori@gmail.com>,
+for the Debian project (but may be used by others).
diff --git a/debian/manpage/casper.7 b/debian/manpage/casper.7
index c6763cf..1bc0b22 100644
--- a/debian/manpage/casper.7
+++ b/debian/manpage/casper.7
@@ -1,4 +1,4 @@
-.TH CASPER 7 "Mon,  25 Sep 2006" "1.68" "Initramfs-tools hook"
+.TH CASPER 7 "Thu,  28 Sep 2006" "1.69" "Initramfs-tools hook"
 
 .SH NAME
 casper \- an hook for initramfs-tools to boot live systems.
@@ -8,15 +8,18 @@ casper \- an hook for initramfs-tools to boot live systems.
 As kernel parameter boot prompt.
 
 .SH DESCRIPTION
-Casper is an hook for initramfs-tools used to boot live systems like those created by make-live, this includes the Debian-Live isos, netboot tarballs, and usb stick image and Ubuntu live cds. At boot time it will look for a (often read only) media containing a "/casper" directory where root filesystems (often squashfs compressed) lies and create, using unionfs, a writable environment for debian like systems to boot from.
+Casper is an hook for initramfs-tools used to generate initramfs able to boot live systems like those created by make-live, this includes the Debian-Live isos, netboot tarballs, and usb stick image and Ubuntu live cds. At boot time it will look for a (often read-only) media containing a "/casper" directory where root filesystems (often squashfs compressed) lies and create, using unionfs, a writable environment for debian like systems to boot from.
 
 .SH RECOGNIZED BOOT OPTIONS
 .TP
+.B casper-getty
+This enable a special serial login shell (experimental).
+.TP
 .BI "host=" HOSTNAME " , userfullname=" USERFULLNAME " , username=" USERNAME
 Those parameters lets you override values read from the config file.
 .TP
-.B casper-getty
-This enable a special serial login shell (experimental).
+.B "showmounts"
+Specifying this will make casper to show on "/" the ro filesystems (mostly compressed) on /casper. This is not enabled by default because could lead to problems by application like "mono" which store binary paths on installation.
 .TP
 .BI ip= IFACE,ADDRESS,NETMASK,GATEWAY [ :IFACE,ADDRESS,NETMASK,GATEWAY "]*"
 Let you specify the name(s) and the options of the interface(s) that should be configured at boot time. Do not specify it if you want to use dhcp (default).
@@ -32,7 +35,7 @@ This tells casper to look for a network mount, to be specified by parameter "nfs
 Casper will look for persistent and snapshot partitions or files labeled "casper-rw", "home-rw", "casper-snap*", "home-snap*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latters in appropriate locations.
 .TP
 .B toram
-Adding this parameter, casper will try to copy to ram the whole read-only media before mounting the root filesystem(s), it could need a lot of ram, according to the space used by the read only media.
+Adding this parameter, casper will try to copy to ram the whole read-only media before mounting the root filesystem(s), it could need a lot of ram, according to the space used by the read-only media.
 
 .SH FILES
 .B /etc/casper.conf
@@ -46,10 +49,10 @@ works fully on amd64, i386 and ppc, it should too on other archs.
 Debian Live project <http://live.debian.net/>
 
 .SH SEE ALSO
-.BR initramfs-tools(8), make-live(8), make-live.conf(8)
+.BR casper-snapshot(1), initramfs-tools(8), make-live(1), make-live.conf(5)
 
 .SH AUTHOR
-casper was written by Tollen Fog Heen <tfheen@canonical.com>, Matt Zimmerman <mdz@canonical.com>, and Marco Amadori <marco.amadori@gmail.com>,
+casper was written by Tollen Fog Heen <tfheen@canonical.com>, Matt Zimmerman <mdz@canonical.com>, and Marco Amadori <marco.amadori@gmail.com>.
 .TP
-This manual was written by Marco Amadori <marco.amadori@gmail.com>,
+This manual page was written by Marco Amadori <marco.amadori@gmail.com>,
 for the Debian project (but may be used by others).
diff --git a/debian/rules b/debian/rules
index cb3bb04..9441b3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,11 @@ endif
 
 	# Building package
 	$(MAKE) -C casper-md5check
+	set -e; \
+	for x in bin/* scripts/casper scripts/casper-bottom/* \
+	         ubiquity-hooks/*; do \
+		sh -n $$x; \
+	done
 
 	touch build-stamp