checkfs: don't check root filesystem if it was already done in initramfs
This commit is contained in:
parent
773585feb7
commit
71fa047717
@ -13,28 +13,29 @@ if [ -f /fastboot ]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -n "Mounting root file system in read-only mode: "
|
echo -n "Checking file systems: "
|
||||||
mount -n -o remount,ro /
|
$PLYMOUTH message --text=$"Checking file systems..."
|
||||||
retval=$?
|
|
||||||
|
|
||||||
if [ $retval != 0 ]; then
|
if [ ! -e /run/initramfs/root-fsck ]; then
|
||||||
|
echo -n "Mounting root file system in read-only mode: "
|
||||||
|
mount -n -o remount,ro /
|
||||||
|
retval=$?
|
||||||
|
|
||||||
|
if [ $retval != 0 ]; then
|
||||||
$FAILURE
|
$FAILURE
|
||||||
echo
|
|
||||||
echo "Cannot check root file system because it could not"
|
echo "Cannot check root file system because it could not"
|
||||||
echo "be mounted in read-only mode."
|
echo "be mounted in read-only mode."
|
||||||
echo
|
echo
|
||||||
echo -n "When you press enter, this system will be halted."
|
|
||||||
$NORMAL
|
$NORMAL
|
||||||
|
$PLYMOUTH message --text=$"Checking file systems...operational error!"
|
||||||
|
echo_warning
|
||||||
echo
|
echo
|
||||||
echo "Press enter to continue..."
|
else
|
||||||
read ans
|
echo_success
|
||||||
echo "gonna run: $rc_base/init.d/halt"
|
echo
|
||||||
$rc_base/init.d/halt
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo_success
|
|
||||||
echo
|
|
||||||
|
|
||||||
if [ -f /forcefsck ]; then
|
if [ -f /forcefsck ]; then
|
||||||
echo "/forcefsck exists, forcing file system check"
|
echo "/forcefsck exists, forcing file system check"
|
||||||
options="-f"
|
options="-f"
|
||||||
@ -42,9 +43,6 @@ else
|
|||||||
options=""
|
options=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -n "Checking file systems: "
|
|
||||||
$PLYMOUTH message --text=$"Checking file systems..."
|
|
||||||
|
|
||||||
# note: -a option used to be -p; but this fails e.g. on fsck.minix
|
# note: -a option used to be -p; but this fails e.g. on fsck.minix
|
||||||
fsck $options -a -A -C -T
|
fsck $options -a -A -C -T
|
||||||
retval=$?
|
retval=$?
|
||||||
|
Loading…
Reference in New Issue
Block a user