From e3050bd87ec873bc4ac1dc21c42c7abd02c3b408 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Fri, 16 Mar 2012 19:16:47 -0400 Subject: reorder fsck opts, explicitly set end of options marker Fixes FS#28947. Signed-off-by: Dave Reisner --- 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 ff0b6d2..8fa4270 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -176,7 +176,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 -- cgit v1.2.3