[Debian-live-changes] r1317 - in dists/trunk/live-initramfs: bin debian hooks scripts

[Daniel Baumann]

Author: daniel
Date: 2007-05-06 13:38:25 +0000 (Sun, 06 May 2007)
New Revision: 1317

Modified:
   dists/trunk/live-initramfs/bin/live-snapshot
   dists/trunk/live-initramfs/debian/dirs
   dists/trunk/live-initramfs/debian/install
   dists/trunk/live-initramfs/debian/rules
   dists/trunk/live-initramfs/hooks/live
   dists/trunk/live-initramfs/scripts/live
Log:


Modified: dists/trunk/live-initramfs/bin/live-snapshot
===================================================================
--- dists/trunk/live-initramfs/bin/live-snapshot	2007-05-06 13:19:19 UTC (rev 1316)
+++ dists/trunk/live-initramfs/bin/live-snapshot	2007-05-06 13:38:25 UTC (rev 1317)
@@ -95,7 +95,7 @@
 	echo "  -o, --output: specifies the output image file (default: $type dependent)."
     echo "  -r, --resync-string: internally used to resync previous made snapshots."
 	echo "  -t, --type: specifies the snapshot type between \"squashfs\", \"ext2\" or \"cpio\".gz archive (default: cpio)"
-    echo -e "\nLook at casper-snapshot(1) man page for more information."
+    echo -e "\nLook at live-snapshot(1) man page for more information."
 	exit 0
 }
 
@@ -211,8 +211,8 @@
 	if [ -z "${dev}" ]; then
 		# create a temp
 		mount -t tmpfs -o rw tmpfs "${MOUNTP}"
-		if [ ! -L /home/$USERNAME/Desktop/casper-snapshot ]; then
-			ln -s "${MOUNTP}" /home/$USERNAME/Desktop/casper-snapshot
+		if [ ! -L /home/$USERNAME/Desktop/live-snapshot ]; then
+			ln -s "${MOUNTP}" /home/$USERNAME/Desktop/live-snapshot
 		fi
 	else
 		if [ -b "${dev}" ] ; then
@@ -223,12 +223,12 @@
 
 Defaults ()
 {
-	MOUNTP="/mnt/casper-snapshot"
+	MOUNTP="/mnt/live-snapshot"
 	COW="/cow"
 	DEV=""
-	DEST="${MOUNTP}/casper-sn.cpio.gz"
+	DEST="${MOUNTP}/live-sn.cpio.gz"
 	TYPE="cpio"
-	DESKTOP_LINK=/home/$USERNAME/Desktop/casper-snapshot
+	DESKTOP_LINK=/home/$USERNAME/Desktop/live-snapshot
 
 	if [ -n "${SNAP_RSTRING}" ]; then
 		COW=$(echo "${SNAP_RSTRING}" | cut -f1 -d ':')

Modified: dists/trunk/live-initramfs/debian/dirs
===================================================================
--- dists/trunk/live-initramfs/debian/dirs	2007-05-06 13:19:19 UTC (rev 1316)
+++ dists/trunk/live-initramfs/debian/dirs	2007-05-06 13:38:25 UTC (rev 1317)
@@ -1,4 +1,4 @@
 /etc
-/usr/lib/casper
+/usr/lib/live-initramfs
 /usr/share/initramfs-tools/hooks
 /usr/share/initramfs-tools/scripts

Modified: dists/trunk/live-initramfs/debian/install
===================================================================
--- dists/trunk/live-initramfs/debian/install	2007-05-06 13:19:19 UTC (rev 1316)
+++ dists/trunk/live-initramfs/debian/install	2007-05-06 13:38:25 UTC (rev 1317)
@@ -1,7 +1,7 @@
 bin/live-getty		sbin
 bin/live-login		sbin
-bin/live-preseed	usr/share/casper
-bin/live-reconfigure	usr/share/casper
+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

Modified: dists/trunk/live-initramfs/debian/rules
===================================================================
--- dists/trunk/live-initramfs/debian/rules	2007-05-06 13:19:19 UTC (rev 1316)
+++ dists/trunk/live-initramfs/debian/rules	2007-05-06 13:38:25 UTC (rev 1317)
@@ -55,7 +55,7 @@
 	dh_installdirs
 
 	# Installing package
-	install -m 0755 live-md5check/live-md5check debian/live-initramfs/usr/lib/casper
+	install -m 0755 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

Modified: dists/trunk/live-initramfs/hooks/live
===================================================================
--- dists/trunk/live-initramfs/hooks/live	2007-05-06 13:19:19 UTC (rev 1316)
+++ dists/trunk/live-initramfs/hooks/live	2007-05-06 13:38:25 UTC (rev 1317)
@@ -24,9 +24,9 @@
 copy_exec /sbin/losetup /sbin
 
 # Casper hooks
-mkdir -p ${DESTDIR}/lib/casper
-copy_exec /usr/share/casper/live-reconfigure /bin
-copy_exec /usr/share/casper/live-preseed /bin
+mkdir -p ${DESTDIR}/lib/live-initramfs
+copy_exec /usr/share/live-initramfs/live-reconfigure /bin
+copy_exec /usr/share/live-initramfs/live-preseed /bin
 
 mkdir -p ${DESTDIR}/lib/udev
 copy_exec /lib/udev/cdrom_id /lib/udev
@@ -62,7 +62,7 @@
 manual_add_modules ohci1394
 
 # integrity check
-copy_exec /usr/lib/casper/live-md5check /bin
+copy_exec /usr/lib/live-initramfs/live-md5check /bin
 
 cp /usr/share/initramfs-tools/scripts/live-functions $DESTDIR/scripts
 cp /usr/share/initramfs-tools/scripts/live-helpers $DESTDIR/scripts

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-05-06 13:19:19 UTC (rev 1316)
+++ dists/trunk/live-initramfs/scripts/live	2007-05-06 13:38:25 UTC (rev 1317)
@@ -21,8 +21,8 @@
 
 . /scripts/live-helpers
 
-if [ ! -f /casper.vars ]; then
-    touch /casper.vars
+if [ ! -f /live.vars ]; then
+    touch /live.vars
 fi
 
 is_casper_path() {