From patchwork Fri Jun 2 19:01:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jon X-Patchwork-Id: 6921 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QXsnD4X43z3wmt for ; Fri, 2 Jun 2023 19:02:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QXsnC1nZzzkG; Fri, 2 Jun 2023 19:02:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QXsnC0BpLz2ybC; Fri, 2 Jun 2023 19:02:07 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QXsn937W6z2xN7 for ; Fri, 2 Jun 2023 19:02:05 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4QXsn76XCGzhC; Fri, 2 Jun 2023 19:02:03 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1685732524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=RgcwmWRH9xTOfl0+FD+o2J1VAWzvx23mxK/aLFZRS2o=; b=pT78xYHTUn7NL7naSsggAxnkLZ1oCkM01XRB1T7tcy5TNzi2Xpzig56hhLlbnrDjdotSUf Ur89MSuyGPpcPcDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1685732524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=RgcwmWRH9xTOfl0+FD+o2J1VAWzvx23mxK/aLFZRS2o=; b=Mcwiv1c5Y6E34gQ+JjlG4Vs0x5YFT77SNYIoqeYnIdt7xnYIoAYWC+bV8Y0nSNRcMXJg8R dMwoSZ9MCOJal/8Eg8NH89ELe4IVkTuv/VonIYMr0KjgnR5Bqm09bw/4/o1DntTrR452uj EL1uMtLxj17W6wzTNoOqnjL09KnrKdqg8nece6qV33khaVptCe9i/+fx7tfjb4Lknkl2Jo RGudDcJu8Bk5EkvUIVX4IyV3EbKDTAIr2kZqnVlzln6Q7Pw4FXHh5s/T/vrLm93TwTC/dW Vgp+WzUa79Tyx2mloTM0HCQIuUViYYRNfP8trDwvpg0Kd0EFjc1DTGzdwTaVQQ== From: Jon Murphy To: development@lists.ipfire.org Subject: [PATCH] extrahd.cgi: Fix for Bug #12863 Date: Fri, 2 Jun 2023 14:01:16 -0500 Message-Id: <20230602190116.1790314-1-jon.murphy@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" -Fixes remove entries in 'extrahd' via the webinterface for extrahd.cgi file. Suggested-by: Bernhard Bitsch Signed-off-by: Jon Murphy Reviewed-by: Michael Tremer Reviewed-by: Bernhard Bitsch --- html/cgi-bin/extrahd.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 36c0efc2e..9dd3a0eee 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -103,7 +103,7 @@ END } elsif ($extrahdsettings{'ACTION'} eq $Lang::tr{'delete'}) { - if ( &General::system("/usr/local/bin/extrahdctrl", "umount", "$extrahdsettings{'PATH'}")) { + if ( ! &General::system("/usr/local/bin/extrahdctrl", "umount", "$extrahdsettings{'PATH'}")) { open( FILE, "< $devicefile" ) or die "Unable to read $devicefile"; @tmp = ; close FILE;