summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2023-03-18 11:07:13 +0100
committer Eric Hameleers <alien@slackware.com>2023-03-18 11:07:13 +0100
commitd7bc7d192d640eba85d80fb3b6c0b6372689fde8 (patch)
tree218b5ed0e6cac82048abed7b4ea0634794c17b4b
parent1cb322896b600878b330951ef4e2cbba837ae2b6 (diff)
downloadliveslak-d7bc7d192d640eba85d80fb3b6c0b6372689fde8.tar.gz
liveslak-d7bc7d192d640eba85d80fb3b6c0b6372689fde8.tar.xz
iso2usb.sh: use correct syntax for '-O' option of tune2fs
-rw-r--r--iso2usb.sh21
1 files changed, 11 insertions, 10 deletions
diff --git a/iso2usb.sh b/iso2usb.sh
index 9c81101..3ea2cd4 100644
--- a/iso2usb.sh
+++ b/iso2usb.sh
@@ -718,19 +718,20 @@ if [ $REFRESH -eq 0 ]; then
# otherwise, the syslinux bootloader (>= 6.03) will fail.
# Note: older 32bit OS-es will trip over the '^64bit' feature so be gentle.
mkfs.ext4 -F -F -L "${LIVELABEL}" ${TARGETP3}
- if ! tune2fs -O ^64bit ${TARGETP3} 1>/dev/null 2>/dev/null ; then
- FEAT_64BIT=""
- else
- FEAT_64BIT="-O ^64bit"
+ UNWANTED_FEAT=""
+ if tune2fs -O ^64bit ${TARGETP3} 1>/dev/null 2>/dev/null ; then
+ UNWANTED_FEAT="^64bit,"
fi
# Grub 2.0.6 stumbles over metadata_csum_seed which is enabled by default
- # since E2fsprogs 1.47.0, so let's disable that too:
- if ! tune2fs -O ^metadata_csum_seed ${TARGETP3} 1>/dev/null 2>/dev/null ; then
- FEAT_CSUM=""
- else
- FEAT_CSUM="-O ^metadata_csum_seed"
+ # since e2fsprogs 1.47.0, so let's disable that too:
+ if tune2fs -O ^metadata_csum_seed ${TARGETP3} 1>/dev/null 2>/dev/null ; then
+ UNWANTED_FEAT="${UNWANTED_FEAT}^metadata_csum_seed,"
+ fi
+ if [ -n "${UNWANTED_FEAT}" ]; then
+ # We found unwanted feature(s), get rid of trailing comma:
+ UNWANTED_FEAT="-O ${UNWANTED_FEAT::-1}"
fi
- tune2fs -c 0 -i 0 -m 0 ${FEAT_64BIT} ${FEAT_CSUM} ${TARGETP3}
+ tune2fs -c 0 -i 0 -m 0 ${UNWANTED_FEAT} ${TARGETP3}
else
# Determine partition names independently of storage architecture:
TARGETP1=$(fdisk -l $TARGET |grep ^$TARGET |cut -d' ' -f1 |grep -E '[^0-9]1$')