Adding live-initramfs 1.87.2-1.

11 files changed, 30 insertions, 177 deletions

diff --git a/debian/changelog b/debian/changelog
index 2016c6f..1125793 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.87.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon,  7 May 2007 00:00:00 +0200
+
 live-initramfs (1.87.1-1) unstable; urgency=low
 
   * Initial release, forking casper.
diff --git a/debian/copyright b/debian/copyright
index d1c73c0..0174d36 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -36,7 +36,7 @@ License:
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL file.
 
-License (casper-md5check/md5.c, casper-md5check/md5,h):
+License (live-md5check/md5.c, live-md5check/md5,h):
 
 	Copyright (C) 1999-2002 Aladdin Enterprises
 	All rights reserved.
diff --git a/debian/dirs b/debian/dirs
index bb225f1..f929f0c 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,4 +1,4 @@
 /etc
-/usr/lib/casper
+/usr/lib/live-initramfs
 /usr/share/initramfs-tools/hooks
 /usr/share/initramfs-tools/scripts
diff --git a/debian/examples b/debian/examples
index 195687c..63403a0 100644
--- a/debian/examples
+++ b/debian/examples
@@ -1 +1 @@
-casper.conf
+conf/live.conf
diff --git a/debian/init b/debian/init
index 4e53eff..7c0dbe9 100644
--- a/debian/init
+++ b/debian/init
@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          casper
+# Provides:          live-initramfs
 # Required-Start:    $syslog
 # Required-Stop:     $syslog
 # Should-Start:      $local_fs
@@ -16,15 +16,15 @@
 #         Marco Amadori <marco.amadori@gmail.com>
 #
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
-NAME=casper
+NAME=live-initramfs
 SCRIPTNAME=/etc/init.d/${NAME}
-DO_SNAPSHOT=/sbin/${NAME}-snapshot
+DO_SNAPSHOT=/sbin/live-snapshot
 
-# Exit if system was not booted by casper
-grep -qs boot=casper /proc/cmdline || exit 0
+# Exit if system was not booted by live-initramfs
+grep -qs boot=live /proc/cmdline || exit 0
 
 # Read configuration variable file if it is present
-[ -r /etc/$NAME.conf ] && . /etc/$NAME.conf
+[ -r /etc/live.conf ] && . /etc/live.conf
 
 # Load the VERBOSE setting and other rcS variables
 [ -f /etc/default/rcS ] && . /etc/default/rcS
diff --git a/debian/install b/debian/install
index 9e87fd8..fb597d4 100644
--- a/debian/install
+++ b/debian/install
@@ -1,7 +1,7 @@
-bin/casper-getty	sbin
-bin/casper-login	sbin
-bin/casper-preseed	usr/share/casper
-bin/casper-reconfigure	usr/share/casper
-bin/casper-snapshot	sbin
+bin/live-getty		sbin
+bin/live-login		sbin
+bin/live-preseed	usr/share/live-initramfs
+bin/live-reconfigure	usr/share/live-initramfs
+bin/live-snapshot	sbin
 hooks			usr/share/initramfs-tools
 scripts			usr/share/initramfs-tools
diff --git a/debian/links b/debian/links
index 0d1d1df..fa3fb68 100644
--- a/debian/links
+++ b/debian/links
@@ -1,2 +1,2 @@
-/usr/share/man/man7/casper.7.gz /usr/share/man/man7/casper-getty.7.gz
-/usr/share/man/man7/casper.7.gz /usr/share/man/man7/casper-login.7.gz
+/usr/share/man/man7/casper.7.gz /usr/share/man/man7/live-getty.7.gz
+/usr/share/man/man7/casper.7.gz /usr/share/man/man7/live-login.7.gz
diff --git a/debian/manpage/casper-snapshot.1 b/debian/manpage/casper-snapshot.1
deleted file mode 100644
index 8f27412..0000000
--- a/debian/manpage/casper-snapshot.1
+++ /dev/null
@@ -1,70 +0,0 @@
-.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 \||\| \-\-device
-.IR DEVICE \|]
-.RB [\| \-e \||\| \-\-exclude\-list
-.IR FILE \|]
-.RB [\| \-o \||\| \-\-output
-.IR FILE \|]
-.RB [\| \-t \||\| \-\-type
-.IR TYPE \|]
-.PP
-.B casper-snapshot
-.RB \-r \||\| \-\-resync\-string
-.IR STRING
-.br
-.B casper-snapshot
-.RB \-h \||\| \-\-help
-.br
-.B casper-snapshot
-.RB \-u \||\| \-\-usage
-.br
-.B casper-snapshot
-.RB \-v \||\| \-\-version
-
-.SH DESCRIPTION
-Casper-snapshot is a script which can be used to build the right types of persistent image files supported by casper. It is also used on exit by the casper init script to resync the boot-found snapshots devices.
-
-.SH OPTIONS
-.TP
-.BI "\-c, \-\-cow" DIRECTORY
-specifies the input directory to be cloned in the image file.
-Its default value "/cow" 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, \-\-device" DEVICE
-sets the device where the media which the snapshot/persistence file/partition will be put. If it is not specified, a tmpfs will be used and linked to the user's desktop to move it where it is needed. If the device has no filesystem, an ext2 fs will be automatically created and labelled according to the values specified after the "--output" value or with a sane default.
-.TP
-.BI "\-e, \-\-exclude\-list" FILE
-a file containing a list of filenames/paths that should not be saved. This exclude list will be remebered on the target snapshot media for reuse.
-.TP
-.BI "\-o, \-\-output" FILE
-the filename/label used for the output file/partition. If left blank, casper-snapshot will search for a proper file on the device or use the whole partition.
-.TP
-.BI "\-r, \-\-resync\-string" STRING
-internally used on resyncs.
-.TP
-.BI "\-t, \-\-type" TYPE
-Type could be one of "cpio", "squashfs" or "ext2".
-
-.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
deleted file mode 100644
index 20805b9..0000000
--- a/debian/manpage/casper.7
+++ /dev/null
@@ -1,84 +0,0 @@
-.TH CASPER 7 "Thu,  28 Sep 2006" "1.69" "Initramfs-tools hook"
-
-.SH NAME
-casper \- a hook for initramfs-tools to boot live systems.
-
-.SH SYNOPSIS
-.B BOOT=casper
-As kernel parameter boot prompt.
-
-.SH DESCRIPTION
-Casper is a hook for initramfs-tools used to generate an initramfs capable to boot live systems as those created by make-live. This includes the Debian-Live isos, netboot tarballs, and usb stick images and Ubuntu live cds. At boot time it will look for a (read-only) media containing a "/casper" directory where a root filesystems (often a compressed squashfs) is stored. If found, it will create a writable environment, using unionfs, for debian like systems to boot from.
-
-.SH RECOGNIZED BOOT OPTIONS
-.TP
-.B casper-getty
-This enables a special "serial" login shell (experimental).
-.TP
-.B xdebconf
-uses xdebconfigurator, if present on the rootfs, to configure X instead of the standard procedure (experimental).
-.TP
-.BI "hostname=" HOSTNAME " , userfullname=" USERFULLNAME " , username=" USERNAME
-Those parameters lets you override values read from the config file.
-.TP
-.BI "{keyb|kbd-chooser/method}=" KEYBOARD " , {klayout|console-setup/layoutcode}=" LAYOUT " , {kvariant|console-setup/variantcode}=" VARIANT " , {kmodel|console-setup/modelcode}=" CODE " ,  koptions=" OPTIONS
-Configure the running keyboard as specified, if this one misses casper behaves as if "keyb=us" was specified. It will be interfered from "locale=" if locale is only 2 lowecase letters as a special case. You could also specify console layout, variant, code, and options (no defaults).
-.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 this if you want to use dhcp (default).
-.TP
-.BR ip[= frommedia ]
-If this variable is set, dhcp and static configuration are just skipped and the system will use the (must be) media-preconfigured /etc/network/interfaces instead.
-.TP
-.BI "{live-media|bootfrom}=" DEVICE
-If you specify one of this two equivalent forms, casper will first try to find this device for the "/casper" directory where the read-only root filesystem should reside. If it did not find something usable, the normal scan for block devices is performed.
-.TP
-.BI "live-media-offset=" BYTES
-This way you could tell casper that your image starts at offset BYTES in the above specified or autodiscovered device, this could be useful to hide the debian-live iso or image inside another iso or image, to create "clean" images.
-.TP
-.BI "locale=" LOCALE " | debian-installer/locale=" LOCALE
-Configure the running locale as specified, if not present the live-media rootfs configured locale will be used and if also this one misses casper behave as "locale=en_US.UTF-8" was specified. If only 2 lowercase letter are specified (like "it"), the "maybe wanted" locale is generated (like it:IT.UTF-8), in this case if also "keyb=" is unspecified is set with those 2 lowercase letters (keyb=it).
-.TP
-.BR "netboot[=" nfs "|" cifs ]
-This tells casper to perform a network mount. The parameter "nfsroot=" (with optional "nfsopts="), should specify where is the location of the root filesystem.  With no args, will try cifs first, and if it fails nfs.
-.TP
-.B persistent
-Casper will look for persistent and snapshot partitions or files labeled "casper-rw", "home-rw", and files called "casper-sn*", "home-sn*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latter in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at casper-snapshot(1) for more informations.
-.TP
-.B nopersistent
-disables the above mentioned "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled.
-.TP
-.B "showmounts"
-This parameter 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 applications like "mono" which store binary paths on installation.
-.TP
-.BI "todisk=" DEVICE
-Adding this parameter, casper will try to copy the entire read-only media to the specified device before mounting the root filesystem. It probably needs a lot of free space. Subsequent boots should then skip this step and just specify the "live-media=DEVICE" boot parameter with the same DEVICE used this time.
-.TP
-.B toram
-Adding this parameter, casper will try to copy the whole read-only media to the computer's RAM before mounting the root filesystem. This could need a lot of ram, according to the space used by the read-only media.
-.TP
-.BI "{preseed/file|file}=" FILE
-A path to a file present on the rootfs could be used to preseed debconf database.
-.TP
-.BI "package/question=" VALUE
-All debian installed packages could be preseeded from command-line that way, beware of blanks spaces, they will interfere with parsing, use a preseed file in this case.
-
-.SH FILES
-.B /etc/casper.conf
-some variables can be configured via this config file.
-
-.SH BUGS
-.B casper
-works fully on amd64, i386 and ppc, it should also run on other archs.
-
-.SH HOMEPAGE
-Debian Live project <http://live.debian.net/>
-
-.SH SEE ALSO
-.BR casper-snapshot(1), initramfs-tools(8), make-live(8), 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>.
-.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/manpages b/debian/manpages
index 31eb23e..96c4bf7 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1 @@
-debian/manpage/*
+manpages/*
diff --git a/debian/rules b/debian/rules
index 34e0fae..79117a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,16 +24,16 @@ build-stamp:
 	dh_testdir
 
 	# Checking scripts
-	for SCRIPT in bin/* scripts/casper scripts/casper-bottom/*; \
+	for SCRIPT in scripts/live scripts/live-bottom/*; \
 	do \
 		sh -n $$SCRIPT || exit 1; \
 	done
 
 	# Setting BUILD_SYSTEM in the binary package
-	sed -i -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' casper.conf
+	sed -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' conf/live.conf > live.conf
 
 	# Building package
-	CFLAGS="$(CFLAGS)" $(MAKE) -C casper-md5check
+	CFLAGS="$(CFLAGS)" $(MAKE) -C bin/live-md5check
 
 	touch build-stamp
 
@@ -43,7 +43,8 @@ clean:
 	rm -f build-stamp
 
 	# Cleaning package
-	$(MAKE) -C casper-md5check clean
+	$(MAKE) -C bin/live-md5check clean
+	rm -f live.conf
 
 	dh_clean
 
@@ -54,8 +55,8 @@ install: build
 	dh_installdirs
 
 	# Installing package
-	install -m 0755 casper-md5check/casper-md5check debian/live-initramfs/usr/lib/casper
-	install -m 0644 casper.conf debian/live-initramfs/etc/casper.conf
+	install -m 0755 bin/live-md5check/live-md5check debian/live-initramfs/usr/lib/live-initramfs
+	install -m 0644 live.conf debian/live-initramfs/etc/live.conf
 
 binary-indep: build install