[Debian-live-changes] r1298 - in dists/trunk/live-initramfs: . bin debian debian/manpage doc hooks scripts

Daniel Baumann daniel at alioth.debian.org
Sun May 6 09:36:39 UTC 2007 

Author: daniel
Date: 2007-05-06 09:36:33 +0000 (Sun, 06 May 2007)
New Revision: 1298

Added:
   dists/trunk/live-initramfs/live.conf
Removed:
   dists/trunk/live-initramfs/casper.conf
Modified:
   dists/trunk/live-initramfs/bin/live-login
   dists/trunk/live-initramfs/bin/live-snapshot
   dists/trunk/live-initramfs/debian/examples
   dists/trunk/live-initramfs/debian/manpage/casper.7
   dists/trunk/live-initramfs/debian/rules
   dists/trunk/live-initramfs/doc/ChangeLog
   dists/trunk/live-initramfs/hooks/casper
   dists/trunk/live-initramfs/scripts/casper
Log:


Modified: dists/trunk/live-initramfs/bin/live-login
===================================================================
--- dists/trunk/live-initramfs/bin/live-login	2007-05-06 09:29:47 UTC (rev 1297)
+++ dists/trunk/live-initramfs/bin/live-login	2007-05-06 09:36:33 UTC (rev 1298)
@@ -1,6 +1,6 @@
 #! /bin/sh
 
 USERNAME=root
-[ -f /etc/casper.conf ] && . /etc/casper.conf
+[ -f /etc/live.conf ] && . /etc/live.conf
 exec /bin/login -f $USERNAME
 

Modified: dists/trunk/live-initramfs/bin/live-snapshot
===================================================================
--- dists/trunk/live-initramfs/bin/live-snapshot	2007-05-06 09:29:47 UTC (rev 1297)
+++ dists/trunk/live-initramfs/bin/live-snapshot	2007-05-06 09:36:33 UTC (rev 1298)
@@ -29,9 +29,9 @@
 VERSION=0.0.1
 
 
-# Source casper conf
-if [ -e /etc/casper.conf ]; then
-	. /etc/casper.conf
+# Source live conf
+if [ -e /etc/live.conf ]; then
+	. /etc/live.conf
 else
 	USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
 	HOSTNAME=$(hostname)

Deleted: dists/trunk/live-initramfs/casper.conf
===================================================================
--- dists/trunk/live-initramfs/casper.conf	2007-05-06 09:29:47 UTC (rev 1297)
+++ dists/trunk/live-initramfs/casper.conf	2007-05-06 09:36:33 UTC (rev 1298)
@@ -1,8 +0,0 @@
-# This file should go in /etc/casper.conf
-# Supported variables are:
-# USERNAME, USERFULLNAME, HOST, BUILD_SYSTEM
-
-export USERNAME="ubuntu"
-export USERFULLNAME="Live session user"
-export HOST="ubuntu"
-export BUILD_SYSTEM="Ubuntu"

Modified: dists/trunk/live-initramfs/debian/examples
===================================================================
--- dists/trunk/live-initramfs/debian/examples	2007-05-06 09:29:47 UTC (rev 1297)
+++ dists/trunk/live-initramfs/debian/examples	2007-05-06 09:36:33 UTC (rev 1298)
@@ -1 +1 @@
-casper.conf
+live.conf

Modified: dists/trunk/live-initramfs/debian/manpage/casper.7
===================================================================
--- dists/trunk/live-initramfs/debian/manpage/casper.7	2007-05-06 09:29:47 UTC (rev 1297)
+++ dists/trunk/live-initramfs/debian/manpage/casper.7	2007-05-06 09:36:33 UTC (rev 1298)
@@ -64,7 +64,7 @@
 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
+.B /etc/live.conf
 some variables can be configured via this config file.
 
 .SH BUGS

Modified: dists/trunk/live-initramfs/debian/rules
===================================================================
--- dists/trunk/live-initramfs/debian/rules	2007-05-06 09:29:47 UTC (rev 1297)
+++ dists/trunk/live-initramfs/debian/rules	2007-05-06 09:36:33 UTC (rev 1298)
@@ -30,7 +30,7 @@
 	done
 
 	# Setting BUILD_SYSTEM in the binary package
-	sed -i -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' casper.conf
+	sed -i -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' live.conf
 
 	# Building package
 	CFLAGS="$(CFLAGS)" $(MAKE) -C live-md5check
@@ -55,7 +55,7 @@
 
 	# Installing package
 	install -m 0755 live-md5check/live-md5check debian/live-initramfs/usr/lib/casper
-	install -m 0644 casper.conf debian/live-initramfs/etc/casper.conf
+	install -m 0644 live.conf debian/live-initramfs/etc/live.conf
 
 binary-indep: build install
 

Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 09:29:47 UTC (rev 1297)
+++ dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 09:36:33 UTC (rev 1298)
@@ -5,6 +5,8 @@
 	  - Renamed to live-*.
 	* casper-md5check:
 	  - Renamed to live-md5check.
+	* casper.conf:
+	  - Renamed to live.conf.
 
 2007-04-30  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/hooks/casper
===================================================================
--- dists/trunk/live-initramfs/hooks/casper	2007-05-06 09:29:47 UTC (rev 1297)
+++ dists/trunk/live-initramfs/hooks/casper	2007-05-06 09:36:33 UTC (rev 1298)
@@ -69,7 +69,7 @@
 
 auto_add_modules net
 
-if [ -e /etc/casper.conf ]; then
+if [ -e /etc/live.conf ]; then
     mkdir -p ${DESTDIR}/etc
-    cp /etc/casper.conf ${DESTDIR}/etc
+    cp /etc/live.conf ${DESTDIR}/etc
 fi

Copied: dists/trunk/live-initramfs/live.conf (from rev 1293, dists/trunk/live-initramfs/casper.conf)
===================================================================
--- dists/trunk/live-initramfs/casper.conf	2007-05-06 07:32:58 UTC (rev 1293)
+++ dists/trunk/live-initramfs/live.conf	2007-05-06 09:36:33 UTC (rev 1298)
@@ -0,0 +1,8 @@
+# This file should go in /etc/live.conf
+# Supported variables are:
+# USERNAME, USERFULLNAME, HOST, BUILD_SYSTEM
+
+export USERNAME="ubuntu"
+export USERFULLNAME="Live session user"
+export HOST="ubuntu"
+export BUILD_SYSTEM="Ubuntu"

Modified: dists/trunk/live-initramfs/scripts/casper
===================================================================
--- dists/trunk/live-initramfs/scripts/casper	2007-05-06 09:29:47 UTC (rev 1297)
+++ dists/trunk/live-initramfs/scripts/casper	2007-05-06 09:36:33 UTC (rev 1298)
@@ -16,7 +16,7 @@
 
 mkdir -p $mountpoint
 
-[ -f /etc/casper.conf ] && . /etc/casper.conf
+[ -f /etc/live.conf ] && . /etc/live.conf
 export USERNAME USERFULLNAME HOST BUILD_SYSTEM
 
 . /scripts/casper-helpers
@@ -294,7 +294,7 @@
             return 1
         fi
     fi
-    echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/casper.conf # for resync on reboot/halt
+    echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/live.conf # for resync on reboot/halt
     return 0
 }

More information about the Debian-live-changes mailing list