From 7bdb656dff60bf18d3f20d6ca0f84fe13d5225b2 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 9 Oct 2012 21:01:01 -0700
Subject: [PATCH] Show un-used partitions too

---
 iscsi-client/iscsi-client-lib.pl |  6 +++---
 iscsi-client/lang/en             |  1 +
 iscsi-client/view_conn.cgi       | 14 ++++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/iscsi-client/iscsi-client-lib.pl b/iscsi-client/iscsi-client-lib.pl
index d56357645..11d0b4deb 100644
--- a/iscsi-client/iscsi-client-lib.pl
+++ b/iscsi-client/iscsi-client-lib.pl
@@ -224,12 +224,12 @@ my $out = &backquote_logged("$cmd 2>&1");
 return $? ? $out : undef;
 }
 
-# get_connection_users(&conn)
+# get_connection_users(&conn, [include-unused])
 # Returns a list of partitions in the device for some connection, and their
 # users (like raid, mount, lvm)
 sub get_connection_users
 {
-my ($conn) = @_;
+my ($conn, $unused) = @_;
 return ( ) if (!$conn->{'device'});
 my @users;
 my @disks = &fdisk::list_disks_partitions();
@@ -237,7 +237,7 @@ my ($disk) = grep { $_->{'device'} eq $conn->{'device'} } @disks;
 next if (!$disk);
 foreach my $part (@{$disk->{'parts'}}) {
 	my @st = &fdisk::device_status($part->{'device'});
-	if (@st) {
+	if (@st || $unused) {
 		push(@users, [ $conn, $part, @st ]);
 		}
 	}
diff --git a/iscsi-client/lang/en b/iscsi-client/lang/en
index e1ad4dd16..94cf087a1 100644
--- a/iscsi-client/lang/en
+++ b/iscsi-client/lang/en
@@ -148,6 +148,7 @@ dconns_part=Partition
 dconns_use=Used by
 dconns_size=Partition size
 dconns_confirm=Remove Connections
+dconns_unused=Unused
 
 vconn_title=iSCSI Connection
 vconn_egone=Selected connection no longer exists!
diff --git a/iscsi-client/view_conn.cgi b/iscsi-client/view_conn.cgi
index d027d51f9..1d523fee3 100755
--- a/iscsi-client/view_conn.cgi
+++ b/iscsi-client/view_conn.cgi
@@ -59,19 +59,21 @@ if ($conn->{'device'}) {
 			&nice_size($disk->{'size'}));
 		}
 
-	my @users = &get_connection_users($conn);
+	my @users = &get_connection_users($conn, 1);
 	if (@users) {
 		my $utable = &ui_columns_start([
 			$text{'dconns_part'},
 			$text{'dconns_size'},
 			$text{'dconns_use'},
-			], undef, 0, [ "", "nowrap", "" ]);
+			], 100, 0, [ "nowrap", "nowrap", "nowrap" ]);
 		foreach my $u (@users) {
 			$utable .= &ui_columns_row([
-				&mount::device_name($u->[1]->{'device'}),
-				&nice_size($u->[1]->{'size'}),
-				&lvm::device_message($u->[2], $u->[3], $u->[4]),
-				], "50");
+			    &mount::device_name($u->[1]->{'device'}),
+			    &nice_size($u->[1]->{'size'}),
+			    $u->[2] ?
+				&lvm::device_message($u->[2], $u->[3], $u->[4])
+				: "<i>$text{'dconns_unused'}</i>",
+			    ], "50");
 			}
 		$utable .= &ui_columns_end();
 		print &ui_table_row($text{'vconn_users'}, $utable);