Update debian live mountpoint directories.

4 files changed, 13 insertions, 13 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;
 }