Merge pull request #151156 from Artturin/fsckonbat

This commit is contained in:
Artturi 2021-12-27 04:18:40 +02:00 committed by GitHub
commit 3239e947d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -263,15 +263,6 @@ if test -n "$debug1devices"; then fail; fi
@postDeviceCommands@
# Return true if the machine is on AC power, or if we can't determine
# whether it's on AC power.
onACPower() {
! test -d "/proc/acpi/battery" ||
! ls /proc/acpi/battery/BAT[0-9]* > /dev/null 2>&1 ||
! cat /proc/acpi/battery/BAT*/state | grep "^charging state" | grep -q "discharg"
}
# Check the specified file system, if appropriate.
checkFS() {
local device="$1"
@ -316,13 +307,6 @@ checkFS() {
return 0
fi
# Don't run `fsck' if the machine is on battery power. !!! Is
# this a good idea?
if ! onACPower; then
echo "on battery power, so no \`fsck' will be performed on \`$device'"
return 0
fi
echo "checking $device..."
fsckFlags=