Handle new LVM output format https://www.virtualmin.com/node/21501

webmin · Mar 10, 2012 · 279a71d · 279a71d
1 parent 6466469
commit 279a71d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lvm/lvm-lib.pl b/lvm/lvm-lib.pl
@@ -297,12 +297,15 @@ sub list_logical_volumes
 	open(DISPLAY, "lvdisplay -m 2>/dev/null |");
 	while(<DISPLAY>) {
 		s/\r|\n//g;
-		if (/LV\s+Name\s+(.*\/(\S+))/i) {
-			$lv = { 'name' => $2,
-				'device' => $1,
+		if (/LV\s+(Name|Path)\s+(.*\/(\S+))/i) {
+			$lv = { 'name' => $3,
+				'device' => $2,
 				'number' => scalar(@rv) };
 			push(@rv, $lv);
 			}
+		elsif (/LV\s+Name\s+[^\/]/) {
+			# Ignore this, as we got the name from LV Path line
+			}
 		elsif (/VG\s+Name\s+(.*)/) {
 			$lv->{'vg'} = $1;
 			}