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
|
||||
fi
|
||||
|
||||
echo -n "Mounting root file system in read-only mode: "
|
||||
mount -n -o remount,ro /
|
||||
retval=$?
|
||||
echo -n "Checking file systems: "
|
||||
$PLYMOUTH message --text=$"Checking file systems..."
|
||||
|
||||
if [ $retval != 0 ]; then
|
||||
$FAILURE
|
||||
echo
|
||||
echo "Cannot check root file system because it could not"
|
||||
echo "be mounted in read-only mode."
|
||||
echo
|
||||
echo -n "When you press enter, this system will be halted."
|
||||
$NORMAL
|
||||
echo
|
||||
echo "Press enter to continue..."
|
||||
read ans
|
||||
echo "gonna run: $rc_base/init.d/halt"
|
||||
$rc_base/init.d/halt
|
||||
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
|
||||
echo "Cannot check root file system because it could not"
|
||||
echo "be mounted in read-only mode."
|
||||
echo
|
||||
$NORMAL
|
||||
$PLYMOUTH message --text=$"Checking file systems...operational error!"
|
||||
echo_warning
|
||||
echo
|
||||
else
|
||||
echo_success
|
||||
echo
|
||||
fi
|
||||
fi
|
||||
|
||||
echo_success
|
||||
echo
|
||||
|
||||
if [ -f /forcefsck ]; then
|
||||
echo "/forcefsck exists, forcing file system check"
|
||||
options="-f"
|
||||
@ -42,9 +43,6 @@ else
|
||||
options=""
|
||||
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
|
||||
fsck $options -a -A -C -T
|
||||
retval=$?
|
||||
|
Loading…
Reference in New Issue
Block a user