From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCHv2 03/12] extrahd.cgi: Abort if a device could not be umounted.
Date: Tue, 01 Aug 2023 17:48:30 +0200
Message-ID: <20230801154839.2373-3-stefan.schantl@ipfire.org>
In-Reply-To: <20230801154839.2373-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2115041212515115356=="
List-Id: <development.lists.ipfire.org>

--===============2115041212515115356==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 html/cgi-bin/extrahd.cgi | 42 +++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
index bafdb9fc9..f31bc2c44 100644
--- a/html/cgi-bin/extrahd.cgi
+++ b/html/cgi-bin/extrahd.cgi
@@ -146,33 +146,35 @@ if ($extrahdsettings{'ACTION'} eq $Lang::tr{'add'}) {
 #
 } elsif ($extrahdsettings{'ACTION'} eq $Lang::tr{'delete'})  {
 	# Call helper binary to unmount the device.
-	&General::system("/usr/local/bin/extrahdctrl", "umount", "$extrahdsettings{=
'PATH'}");
+	unless(&General::system("/usr/local/bin/extrahdctrl", "umount", "$extrahdse=
ttings{'PATH'}")) {
+		# Open the device file for reading.
+		open(FILE, "< $devicefile" ) or die "Unable to read $devicefile";
=20
-	# Open the device file for reading.
-	open(FILE, "< $devicefile" ) or die "Unable to read $devicefile";
+		# Read the file content into a temporary array.
+		my @tmp =3D <FILE>;
=20
-	# Read the file content into a temporary array.
-	my @tmp =3D <FILE>;
-
-	# Close file handle.
-	close(FILE);
+		# Close file handle.
+		close(FILE);
=20
-	# Re-open device file for writing.
-	open(FILE, "> $devicefile" ) or die "Unable to write $devicefile";
+		# Re-open device file for writing.
+		open(FILE, "> $devicefile" ) or die "Unable to write $devicefile";
=20
-	# Loop through the previous read file content.
-	foreach my $line (sort @tmp) {
-		# Split line content and assign nice variables.
-		my ($uuid, $fs, $path) =3D split( /\;/, $line );
+		# Loop through the previous read file content.
+		foreach my $line (sort @tmp) {
+			# Split line content and assign nice variables.
+			my ($uuid, $fs, $path) =3D split( /\;/, $line );
=20
-		# Write the line in case it does not contain our element to delete.
-		if ($path ne $extrahdsettings{'PATH'}) {
-			print FILE "$line";
+			# Write the line in case it does not contain our element to delete.
+			if ($path ne $extrahdsettings{'PATH'}) {
+				print FILE "$line";
+			}
 		}
-	}
=20
-	# Close file handle.
-	close(FILE);
+		# Close file handle.
+		close(FILE);
+	} else {
+		$errormessage =3D "$Lang::tr{'extrahd cant umount'} $extrahdsettings{'PATH=
'}$Lang::tr{'extrahd maybe the device is in use'}?";
+	}
 }
=20
 if ($errormessage) {
--=20
2.39.2


--===============2115041212515115356==--