aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-10-01 11:17:41 +0200
committer Eric Hameleers <alien@slackware.com>2017-10-01 11:17:41 +0200
commit8fc25247aaff633000bb151dc82ed5834f944522 (patch)
tree6f1f80ff58eff606452ee97ac59492e00478cde2
parent2735c81949675a373341911d370dd3a09b8d85e8 (diff)
downloadliveslak-8fc25247aaff633000bb151dc82ed5834f944522.tar.gz
liveslak-8fc25247aaff633000bb151dc82ed5834f944522.tar.xz
iso2usb.sh: be gentle with old non-Slackware 32bit distros
Diffstat (limited to '')
-rw-r--r--iso2usb.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/iso2usb.sh b/iso2usb.sh
index dbf1a93..3f86775 100644
--- a/iso2usb.sh
+++ b/iso2usb.sh
@@ -632,8 +632,14 @@ if [ $REFRESH -eq 0 ]; then
# features enabled by default.
# Explicitly disable 64bit feature in the mke2fs command with '-O ^64bit';
# otherwise, the syslinux bootloader (>= 6.03) will fail.
- mkfs.ext4 -F -F -L "${LIVELABEL}" -m 0 -O ^64bit ${TARGET}3
- tune2fs -c 0 -i 0 ${TARGET}3
+ # Note: older 32bit OS-es will trip over the '^64bit' feature so be gentle.
+ mkfs.ext4 -F -F -L "${LIVELABEL}" ${TARGET}3
+ if ! tune2fs -O '^64bit' ${TARGET}3 1>/dev/null 2>/dev/null ; then
+ FEAT_64BIT=""
+ else
+ FEAT_64BIT="-O '^64bit'"
+ fi
+ tune2fs -c 0 -i 0 -m 0 ${FEAT_64BIT} ${TARGET}3
fi # End [ $REFRESH -eq 0 ]