e2fsprogs-1.46.3

2021-08-06 11:35:07 +03:00
parent 21ee3a1c6f
commit 937948e5ba
3 changed files with 53 additions and 1 deletions
@@ -0,0 +1,26 @@
+Index: e2fsprogs-1.45.6/scrub/e2scrub.in
+===================================================================
+--- e2fsprogs-1.45.6.orig/scrub/e2scrub.in
+++ e2fsprogs-1.45.6/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"
+Index: e2fsprogs-1.45.6/scrub/e2scrub_all.in
+===================================================================
+--- e2fsprogs-1.45.6.orig/scrub/e2scrub_all.in
+++ e2fsprogs-1.45.6/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"
@@ -0,0 +1,16 @@
+diff --git a/tests/u_direct_io/script b/tests/u_direct_io/script
+index 0b5d7083..b4f07752 100644
+--- a/tests/u_direct_io/script
+++ b/tests/u_direct_io/script
+@@ -9,6 +9,11 @@ elif test ! -x $DEBUGFS_EXE; then
+ else
+     dd if=/dev/zero of=$TMPFILE bs=1M count=128 > /dev/null 2>&1
+     LOOP=$(losetup --show --sector-size 4096 -f $TMPFILE)
+    if [ ! -b "$LOOP" ]; then
+        echo "$test_name: $DESCRIPTION: skipped (no loop devices)"
+        rm -f $TMPFILE
+        exit 0
+    fi
+     echo mke2fs -F -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D \$LOOP > $OUT
+     $MKE2FS -F -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D $LOOP 2>&1 | \
+ 	sed -f $cmd_dir/filter.sed >> $OUT