2b183d9ca9
Rebase to the newest upstream release 1.46.2 (#1979905) Resolves: rhbz#1979905 Signed-off-by: Lukas Czerner <lczerner@redhat.com>
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From e788b8ae43e176221c6d5c4a20e6ca7b4198ac45 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Czerner <lczerner@redhat.com>
|
|
Date: Fri, 2 Jul 2021 11:56:02 +0200
|
|
Subject: [PATCH 1/4] Remove local PATH
|
|
|
|
---
|
|
scrub/e2scrub.in | 2 +-
|
|
scrub/e2scrub_all.in | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/scrub/e2scrub.in b/scrub/e2scrub.in
|
|
index 30ab7cbd..bfca1ce4 100644
|
|
--- a/scrub/e2scrub.in
|
|
+++ b/scrub/e2scrub.in
|
|
@@ -23,7 +23,7 @@
|
|
# check filesystems in VGs that have at least 256MB (or so) of
|
|
# free space.
|
|
|
|
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
|
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
|
|
|
|
if (( $EUID != 0 )); then
|
|
echo "e2scrub must be run as root"
|
|
diff --git a/scrub/e2scrub_all.in b/scrub/e2scrub_all.in
|
|
index 4288b969..606ac254 100644
|
|
--- a/scrub/e2scrub_all.in
|
|
+++ b/scrub/e2scrub_all.in
|
|
@@ -18,7 +18,7 @@
|
|
# along with this program; if not, write the Free Software Foundation,
|
|
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
|
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
|
|
|
|
if (( $EUID != 0 )); then
|
|
echo "e2scrub_all must be run as root"
|
|
--
|
|
2.31.1
|
|
|