Add a disk-install uri for old disk based installs in image tools

1 files changed, 8 insertions, 0 deletions

diff --git a/scripts/vyatta-image-tools.pl b/scripts/vyatta-image-tools.pl
index 1fd139c..2edeb10 100755
--- a/scripts/vyatta-image-tools.pl
+++ b/scripts/vyatta-image-tools.pl
@@ -46,6 +46,8 @@ sub conv_file {
   }
   if ( $topdir eq "running" ) {
     $file = "/$file";
+  } elsif ( lc($topdir) eq 'disk-install' ) {
+    $file = "/live/image/$file";
   } elsif ( lc($topdir) eq 'tftp') {
     $file = $filein;
     $topdir = 'url';
@@ -72,6 +74,8 @@ sub conv_file_to_rel {
   my ($topdir, $filename) = @_;
   if ($topdir eq "running"){
     $filename =~ s?/?$topdir://?;
+  } elsif ($topdir eq "disk-install") {
+    $filename =~ s?/live/image/?$topdir://?; 
   } else {
     $filename =~ s?/live/image/boot/$topdir/live-rw/?$topdir://?;
   }
@@ -175,6 +179,10 @@ sub update {
     print "Cannot clone to running\n";
     exit 1;
   }
+  if ($t_topdir eq 'disk-install'){
+    print "Cannot clone to running\n";
+    exit 1;
+  }
   if ($t_topdir eq 'url'){
     print "Cannot clone to a url\n";
     exit 1;