Update debian live mountpoint directories.

14 files changed, 30 insertions, 30 deletions

diff --git a/scripts/rename-image.pl b/scripts/rename-image.pl
index 2c77d70..591c29d 100644
--- a/scripts/rename-image.pl
+++ b/scripts/rename-image.pl
@@ -27,7 +27,7 @@ use File::Temp qw/ tempfile tempdir /;
 use File::Copy;
 use Sys::Syslog qw/:standard :macros/;
 
-my $UNION_BOOT = '/live/image/boot';
+my $UNION_BOOT = '/lib/live/mount/persistence/boot';
 my $XEN_DEFAULT_IMAGE = "$UNION_BOOT/%%default_image";
 
 my $old_name;
@@ -43,7 +43,7 @@ if (!defined($old_name) || !defined($new_name)) {
     exit 1;
 }
 
-my $image_path = "/live/image/boot";
+my $image_path = "/lib/live/mount/persistence/boot";
 
 if (! -e "$image_path") {
     # must be running on old non-image installed system
@@ -80,7 +80,7 @@ if ($cur_name =~ s/BOOT_IMAGE=\/boot\///) {
 	# On Xen/pygrub systems, we figure out the running version by
 	# looking at the bind mount of /boot.
 	$cur_name = `mount | awk '/on \\/boot / { print \$1 }'`;
-	$cur_name =~ s/\/live\/image\/boot\///;
+	$cur_name =~ s/\/lib\/live\/mount\/persistence\/boot\///;
 	chomp($cur_name);
     }
 }
diff --git a/scripts/show-image-storage.pl b/scripts/show-image-storage.pl
index f8de35e..863b913 100644
--- a/scripts/show-image-storage.pl
+++ b/scripts/show-image-storage.pl
@@ -40,8 +40,8 @@ sub better_units {
 #
 
 # Figure out where the images live...
-my $imagedir = "/live/image/boot";
-my $livecd = "/live/image/live";
+my $imagedir = "/lib/live/mount/persistence/boot";
+my $livecd = "/lib/live/mount/persistence/live";
 if (! -e $imagedir) {
     if (-d $livecd) {
         die "System running on Live-CD\n";
@@ -73,11 +73,11 @@ foreach my $image (@bootlist_arr) {
 	($total, $garbage) = split(' ', $string);
 	$total = better_units($total);
 
-	$string = `du -s -h $imagedir/$image --exclude live-rw`;
+	$string = `du -s -h $imagedir/$image --exclude rw`;
 	($read_only, $garbage) = split(' ', $string);
 	$read_only = better_units($read_only);
 
-	$string = `du -s -h $imagedir/$image/live-rw`;
+	$string = `du -s -h $imagedir/$image/rw`;
 	($read_write, $garbage) = split(' ', $string);
 	$read_write = better_units($read_write);
 
diff --git a/scripts/vyatta-boot-image.pl b/scripts/vyatta-boot-image.pl
index e1d4a8c..52b4769 100755
--- a/scripts/vyatta-boot-image.pl
+++ b/scripts/vyatta-boot-image.pl
@@ -409,7 +409,7 @@ sub curVer {
 	# On Xen/pygrub systems, we figure out the running version by
 	# looking at the bind mount of /boot.
 	$vers = `mount | awk '/on \\/boot / { print \$1 }'`;
-	$vers =~ s/\/live\/image\/boot\///;
+	$vers =~ s/\/lib\/live\/mount\/persistence\/boot\///;
 	chomp($vers);
     }
 
diff --git a/scripts/vyatta-image-tools.pl b/scripts/vyatta-image-tools.pl
index 6bcfd7d..2dd95df 100755
--- a/scripts/vyatta-image-tools.pl
+++ b/scripts/vyatta-image-tools.pl
@@ -50,7 +50,7 @@ sub conv_file {
     if ($topdir eq "running") {
         $file = "/$file";
     } elsif (lc($topdir) eq 'disk-install') {
-        $file = "/live/image/$file";
+        $file = "/lib/live/mount/persistence/$file";
     } elsif (lc($topdir) eq 'tftp') {
         $file = $filein;
         $topdir = 'url';
@@ -64,11 +64,11 @@ sub conv_file {
         $file = $filein;
         $topdir = 'url';
     } else {
-        if (!-d "/live/image/boot/$topdir/live-rw"){
+        if (!-d "/lib/live/mount/persistence/boot/$topdir/rw"){
             print "Image $topdir not found!\n";
             exit 1;
         }
-        $file = "/live/image/boot/$topdir/live-rw/$file";
+        $file = "/lib/live/mount/persistence/boot/$topdir/rw/$file";
     }
     return ($topdir, $file);
 }
@@ -78,9 +78,9 @@ sub conv_file_to_rel {
     if ($topdir eq "running"){
         $filename =~ s?/?$topdir://?;
     } elsif ($topdir eq "disk-install") {
-        $filename =~ s?/live/image/?$topdir://?;
+        $filename =~ s?/lib/live/mount/persistence/?$topdir://?;
     } else {
-        $filename =~ s?/live/image/boot/$topdir/live-rw/?$topdir://?;
+        $filename =~ s?/lib/live/mount/persistence/boot/$topdir/rw/?$topdir://?;
     }
     return $filename;
 }
diff --git a/templates/add/raid/node.tag/member/node.tag/node.def b/templates/add/raid/node.tag/member/node.tag/node.def
index b526e1e..14ac911 100644
--- a/templates/add/raid/node.tag/member/node.tag/node.def
+++ b/templates/add/raid/node.tag/member/node.tag/node.def
@@ -40,7 +40,7 @@ run:
 	    mounted_on_root=0
 	    mounted_on=`mount | grep "^/dev/${raid_set}" | awk '{ print $3 }'`
 	    for dir in $mounted_on ; do
-		if [ "$dir" = "/" -o "$dir" = "/live/image" ]; then
+		if [ "$dir" = "/" -o "$dir" = "/lib/live/mount/persistence" ]; then
 		    mounted_on_root=1
 		fi
 	    done
diff --git a/templates/clone/system/config/node.tag/from/node.tag/node.def b/templates/clone/system/config/node.tag/from/node.tag/node.def
index c244559..d883c8c 100644
--- a/templates/clone/system/config/node.tag/from/node.tag/node.def
+++ b/templates/clone/system/config/node.tag/from/node.tag/node.def
@@ -1,11 +1,11 @@
 help: Image to update from
-allowed: reply=( $(compgen -d /live/image/boot/ | grep -v grub) )
+allowed: reply=( $(compgen -d /lib/live/mount/persistence/boot/ | grep -v grub) )
     for i in `seq 0 $[${#reply[@]}-1]`; do
       file=${reply[$i]}
-      reply[$i]=${file/#\/live\/image\/boot\//}
+      reply[$i]=${file/#\/lib\/live\/mount\/persistence\/boot\//}
     done
     reply+=( "running" )
-    if [[ -d /live/image/config ]];then
+    if [[ -d /lib/live/mount/persistence/config ]];then
       reply+=( "disk-install" )
     fi
     echo "${reply[*]}"
diff --git a/templates/clone/system/config/node.tag/node.def b/templates/clone/system/config/node.tag/node.def
index 6e6e340..ec82322 100644
--- a/templates/clone/system/config/node.tag/node.def
+++ b/templates/clone/system/config/node.tag/node.def
@@ -1,8 +1,8 @@
 help: Image to update
-allowed: reply=( $(compgen -d /live/image/boot/ | grep -v grub) )
+allowed: reply=( $(compgen -d /lib/live/mount/persistence/boot/ | grep -v grub) )
     for i in `seq 0 $[${#reply[@]}-1]`; do
       file=${reply[$i]}
-      reply[$i]=${file/#\/live\/image\/boot\//}
+      reply[$i]=${file/#\/lib\/live\/mount\/persistence\/boot\//}
     done
     echo "${reply[*]}"
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ];
diff --git a/templates/show/log/image/node.tag/all/node.def b/templates/show/log/image/node.tag/all/node.def
index eb3c87c..fd15df0 100644
--- a/templates/show/log/image/node.tag/all/node.def
+++ b/templates/show/log/image/node.tag/all/node.def
@@ -2,4 +2,4 @@ help: Show contents of all master log files for image
 run: eval $(lesspipe)
      less $_vyatta_less_options \
 	--prompt=".log?m, file %i of %m., page %dt of %D" \
-	-- `printf "%s\n" /live/image/boot/$4/live-rw/var/log/messages* | sort -nr`
+	-- `printf "%s\n" /lib/live/mount/persistence/boot/$4/rw/var/log/messages* | sort -nr`
diff --git a/templates/show/log/image/node.tag/authorization/node.def b/templates/show/log/image/node.tag/authorization/node.def
index aec45cc..e7e3330 100644
--- a/templates/show/log/image/node.tag/authorization/node.def
+++ b/templates/show/log/image/node.tag/authorization/node.def
@@ -1,4 +1,4 @@
 help: Show listing of authorization attempts for image
 run: less $_vyatta_less_options \
 	--prompt=".log, page %dt of %D" \
-	-- /live/image/boot/$4/live-rw/var/log/auth.log
+	-- /lib/live/mount/persistence/boot/$4/rw/var/log/auth.log
diff --git a/templates/show/log/image/node.tag/directory/node.def b/templates/show/log/image/node.tag/directory/node.def
index d9cb9cb..6d813cf 100644
--- a/templates/show/log/image/node.tag/directory/node.def
+++ b/templates/show/log/image/node.tag/directory/node.def
@@ -1,4 +1,4 @@
 help: Show listing of user-defined log files for image
-run: if [ -d /live/image/boot/$4/live-rw/var/log/user ]
-     then ls /live/image/boot/$4/live-rw/var/log/user
+run: if [ -d /lib/live/mount/persistence/boot/$4/rw/var/log/user ]
+     then ls /lib/live/mount/persistence/boot/$4/rw/var/log/user
      fi
diff --git a/templates/show/log/image/node.tag/file/node.tag/node.def b/templates/show/log/image/node.tag/file/node.tag/node.def
index f347a86..5f6bb18 100644
--- a/templates/show/log/image/node.tag/file/node.tag/node.def
+++ b/templates/show/log/image/node.tag/file/node.tag/node.def
@@ -1,7 +1,7 @@
 help: Show contents of specified user-defined log file for image
 allowed: local -a array ;
-         array=( /live/image/boot/${COMP_WORDS[3]}/live-rw/var/log/user/* ) ;
+         array=( /lib/live/mount/persistence/boot/${COMP_WORDS[3]}/rw/var/log/user/* ) ;
          [ ${#array[@]} -gt 0 ] && echo  -n ${array[@]##*/} || echo -n none
 run: less $_vyatta_less_options \
 	--prompt=".$4 log, page %dt of %D" \
-	-- /live/image/boot/$4/live-rw/var/log/user/$6
+	-- /lib/live/mount/persistence/boot/$4/rw/var/log/user/$6
diff --git a/templates/show/log/image/node.tag/node.def b/templates/show/log/image/node.tag/node.def
index daeb44e..05e7d01 100644
--- a/templates/show/log/image/node.tag/node.def
+++ b/templates/show/log/image/node.tag/node.def
@@ -1,11 +1,11 @@
 help: Show contents of master log file for image
-allowed: reply=( $(compgen -f /live/image/boot/ | grep -v grub) )
+allowed: reply=( $(compgen -f /lib/live/mount/persistence/boot/ | grep -v grub) )
     for i in `seq 0 $[${#reply[@]}-1]`; do
       file=${reply[$i]}
-      reply[$i]=${file/#\/live\/image\/boot\//}
+      reply[$i]=${file/#\/lib\/live\/mount\/persistence\/boot\//}
     done
     echo "${reply[*]}"
 
 run: less $_vyatta_less_options \
 	--prompt=".log, page %dt of %D" \
-	-- /live/image/boot/$4/live-rw/var/log/messages
+	-- /lib/live/mount/persistence/boot/$4/rw/var/log/messages
diff --git a/templates/show/log/image/node.tag/tail/node.def b/templates/show/log/image/node.tag/tail/node.def
index c7f0190..090eae4 100644
--- a/templates/show/log/image/node.tag/tail/node.def
+++ b/templates/show/log/image/node.tag/tail/node.def
@@ -1,2 +1,2 @@
 help: Show last lines of messages file
-run: tail /live/image/boot/$4/live-rw/var/log/messages
+run: tail /lib/live/mount/persistence/boot/$4/rw/var/log/messages
diff --git a/templates/show/log/image/node.tag/tail/node.tag/node.def b/templates/show/log/image/node.tag/tail/node.tag/node.def
index f0af559..2c3eb14 100644
--- a/templates/show/log/image/node.tag/tail/node.tag/node.def
+++ b/templates/show/log/image/node.tag/tail/node.tag/node.def
@@ -1,3 +1,3 @@
 help: Show last changes to messages
 allowed: echo -n '<NUMBER>'
-run: tail -n "$6"  /live/image/boot/$4/live-rw/var/log/messages | ${VYATTA_PAGER:-cat}
+run: tail -n "$6"  /lib/live/mount/persistence/boot/$4/rw/var/log/messages | ${VYATTA_PAGER:-cat}