Bugfix 7502: Make "delete system image" work correctly on Xen

Also, improved detection of currently running image in the "rename
system image" command.

2 files changed, 45 insertions, 12 deletions

diff --git a/scripts/rename-image.pl b/scripts/rename-image.pl
index fcdf624..8632334 100644
--- a/scripts/rename-image.pl
+++ b/scripts/rename-image.pl
@@ -70,8 +70,16 @@ my $cur_name;
 if ($cur_name =~ s/BOOT_IMAGE=\/boot\///) {
     $cur_name =~ s/\/vmlinuz.*//;
 } else {
+    # Boot command line is not formatted as it would be for a system
+    # booted via grub2 with union mounted root filesystem.  Another
+    # possibility is that it the system is Xen booted via pygrub.
+    #
     if (-l $XEN_DEFAULT_IMAGE) {
-	$cur_name = readlink($XEN_DEFAULT_IMAGE);
+	# 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\///;
+	chomp($cur_name);
     }
 }
 
diff --git a/scripts/vyatta-boot-image.pl b/scripts/vyatta-boot-image.pl
index 7c80da7..d2eb3fd 100755
--- a/scripts/vyatta-boot-image.pl
+++ b/scripts/vyatta-boot-image.pl
@@ -59,13 +59,16 @@ sub parseGrubCfg {
     my @entries = ();
     my $in_entry = 0;
     my $idx = 0;
+    my $curver;
     my $running_boot_cmd=`cat /proc/cmdline`;
     if (! ($running_boot_cmd =~ s/BOOT_IMAGE=//)) {
-	# Mis-formatted boot cmd.  It might be Xen, which boots with pygrub.
-	# We use a symlink in this case to point to the default image.
+	# Mis-formatted boot cmd.  Look harder to to find the current
+	# version string.
 	#
-	if (-l $XEN_DEFAULT_IMAGE) {
-	    $running_boot_cmd = readlink($XEN_DEFAULT_IMAGE);
+	$curver = curVer();
+	if (defined($curver)) {
+	    # Only one of $running_boot_cmd or $curver should be defined.
+	    undef $running_boot_cmd;
 	}
     }
     while (<$fd>) {
@@ -108,10 +111,19 @@ sub parseGrubCfg {
 		} else {
 		    $ehash{'reset'} = 0;
 		}
-		if (/$running_boot_cmd/) {
-		    $ehash{'running_vers'} = 1;
-		} else {
-		    $ehash{'running_vers'} = 0;
+		if (defined($running_boot_cmd)) {
+		    if (/$running_boot_cmd/) {
+			$ehash{'running_vers'} = 1;
+		    } else {
+			$ehash{'running_vers'} = 0;
+		    }
+		} elsif (defined($curver)) {
+		    my $matchstr = "/boot/$curver/vmlinuz";
+		    if (/$matchstr/) {
+			$ehash{'running_vers'} = 1;
+		    } else {
+			$ehash{'running_vers'} = 0;
+		    }
 		}
 		push @entries, \%ehash;
 		$in_entry++;
@@ -392,9 +404,22 @@ sub curVer {
     my $vers = `awk '{print \$1}' /proc/cmdline`;
 
     # In an image-booted system, the image name is the directory name
-    # directory under "/boot" in the pathname of the kernel we booted.
-    $vers =~ s/BOOT_IMAGE=\/boot\///;
-    $vers =~ s/\/?vmlinuz.*\n$//;
+    # under "/boot" in the pathname of the kernel we booted.
+    if ($vers =~ s/BOOT_IMAGE=\/boot\///) {
+	$vers =~ s/\/?vmlinuz.*\n$//;
+    } else {
+	# Boot command line is not formatted as it would be for a system
+	# booted via grub2 with union mounted root filesystem.  Another
+	# possibility is that it the system is Xen booted via pygrub.
+	#
+	if (-l $XEN_DEFAULT_IMAGE) {
+	    # 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\///;
+	    chomp($vers);
+	}
+    }
 
     # In a non-image system, the kernel resides directly under "/boot".
     # No second-level directory means that $vers will be null.