[Debian-live-changes] r1315 - in dists/trunk/live-initramfs: conf scripts

[Daniel Baumann]

Author: daniel
Date: 2007-05-06 13:18:31 +0000 (Sun, 06 May 2007)
New Revision: 1315

Modified:
   dists/trunk/live-initramfs/conf/live.conf
   dists/trunk/live-initramfs/scripts/live
Log:


Modified: dists/trunk/live-initramfs/conf/live.conf
===================================================================
--- dists/trunk/live-initramfs/conf/live.conf	2007-05-06 13:12:52 UTC (rev 1314)
+++ dists/trunk/live-initramfs/conf/live.conf	2007-05-06 13:18:31 UTC (rev 1315)
@@ -5,3 +5,5 @@
 USERNAME="user"
 USERFULLNAME="Live session user"
 HOST="debian"
+
+export BUILD_SYSTEM USERNAME USERFULLNAME HOST

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-05-06 13:12:52 UTC (rev 1314)
+++ dists/trunk/live-initramfs/scripts/live	2007-05-06 13:18:31 UTC (rev 1315)
@@ -9,7 +9,7 @@
 
 mountpoint=/cdrom
 
-USERNAME=casper
+USERNAME=user
 USERFULLNAME="Live session user"
 HOST=live
 BUILD_SYSTEM=Custom
@@ -27,10 +27,10 @@
 
 is_casper_path() {
     path=$1
-    if [ -d "$path/casper" ]; then
-        if [ "$(echo $path/casper/*.squashfs)" != "$path/casper/*.squashfs" ] ||
-            [ "$(echo $path/casper/*.ext2)" != "$path/casper/*.ext2" ] ||
-            [ "$(echo $path/casper/*.dir)" != "$path/casper/*.dir" ]; then
+    if [ -d "$path/live" ]; then
+        if [ "$(echo $path/live/*.squashfs)" != "$path/live/*.squashfs" ] ||
+            [ "$(echo $path/live/*.ext2)" != "$path/live/*.ext2" ] ||
+            [ "$(echo $path/live/*.dir)" != "$path/live/*.dir" ]; then
             return 0
         fi
     fi
@@ -46,7 +46,7 @@
             echo "directory"
             ;;
         *)
-            panic "Unrecognized casper filesystem: $1"
+            panic "Unrecognized live filesystem: $1"
             ;;
     esac
 }
@@ -64,10 +64,10 @@
 mount_images_in_directory() {
     directory="$1"
     rootmnt="$2"
-    if match_files_in_dir "$directory/casper/*.squashfs" ||
-        match_files_in_dir "$directory/casper/*.ext2" ||
-        match_files_in_dir "$directory/casper/*.dir"; then
-        setup_unionfs "$directory/casper" "$rootmnt"
+    if match_files_in_dir "$directory/live/*.squashfs" ||
+        match_files_in_dir "$directory/live/*.ext2" ||
+        match_files_in_dir "$directory/live/*.dir"; then
+        setup_unionfs "$directory/live" "$rootmnt"
     else
         :
     fi
@@ -378,15 +378,15 @@
 
     if [ -n "${SHOWMOUNTS}" ]; then
         for d in ${rofslist}; do
-            mkdir -p "${rootmnt}/casper/${d##*/}"
+            mkdir -p "${rootmnt}/live/${d##*/}"
             case d in
-                *.dir) # do nothing # mount -o bind "${d}" "${rootmnt}/casper/${d##*/}"
+                *.dir) # do nothing # mount -o bind "${d}" "${rootmnt}/live/${d##*/}"
                     ;;
-                *) mount -o move "${d}" "${rootmnt}/casper/${d##*/}"
+                *) mount -o move "${d}" "${rootmnt}/live/${d##*/}"
                     ;;
             esac
         done
-        # shows cow fs on /cow for use by casper-snapshot
+        # shows cow fs on /cow for use by live-snapshot
         mkdir -p "${rootmnt}/cow"
         mount -o bind /cow "${rootmnt}/cow"
     fi
@@ -486,7 +486,7 @@
 mountroot() {
     exec 6>&1
     exec 7>&2
-    exec > casper.log
+    exec > live.log
     exec 2>&1
 
     set_usplash_timeout
@@ -545,5 +545,5 @@
 
     exec 1>&6 6>&-
     exec 2>&7 7>&-
-    cp casper.log "${rootmnt}/var/log/"
+    cp live.log "${rootmnt}/var/log/"
 }