[arch-projects] [initscripts][PATCH] reorder fsck opts, explicitly set end of options marker
Dave Reisner
d at falconindy.com
Fri Mar 16 19:16:47 EDT 2012
Fixes FS#28947.
Signed-off-by: Dave Reisner <dreisner at archlinux.org>
---
functions | 2 +-
rc.sysinit | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/functions b/functions
index f8a7acd..0b7fd8d 100644
--- a/functions
+++ b/functions
@@ -432,7 +432,7 @@ fsck_all() {
IGNORE_MOUNTED="-M"
fi
- fsck -A -T -C${FSCK_FD} -a -t no${NETFS//,/,no},noopts=_netdev ${FORCEFSCK} ${IGNORE_MOUNTED}
+ fsck -A -T -C${FSCK_FD} -a -t no${NETFS//,/,no},noopts=_netdev ${IGNORE_MOUNTED} -- ${FORCEFSCK}
}
# Single-user login and/or automatic reboot after fsck (if needed)
diff --git a/rc.sysinit b/rc.sysinit
index 9880995..d353357 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -178,7 +178,7 @@ if [[ -f /etc/crypttab && $CS ]] && grep -q ^[^#] /etc/crypttab; then
fi
# Check filesystems
-[[ -f /forcefsck ]] || in_array forcefsck $(< /proc/cmdline) && FORCEFSCK="-- -f"
+[[ -f /forcefsck ]] || in_array forcefsck $(< /proc/cmdline) && FORCEFSCK="-f"
declare -r FORCEFSCK
if [[ -n $FORCEFSCK ]] || { [[ ! -f /fastboot ]] && ! in_array fastboot $(< /proc/cmdline); }; then
--
1.7.9.4
More information about the arch-projects
mailing list