aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-04-09 00:21:49 +0000
committerRoy Marples <roy@marples.name>2008-04-09 00:21:49 +0000
commit0e114abf5d81089787600f4028402f38198c5baa (patch)
tree5161b17fc010ad7ed57a297b00006848ce3f7c76
parentbc369085c75ebca4d5c7aa803d98fef6b92c2622 (diff)
Respect shutdown's fastboot.
-rw-r--r--init.d/fsck.in5
-rw-r--r--init.d/root.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/init.d/fsck.in b/init.d/fsck.in
index 5bf9ba8a..f469ce81 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -29,6 +29,11 @@ start()
{
local reboot_opts= fsck_opts= p=
+ if [ -e /fastboot ]; then
+ ewarn "Skipping fsck due to /fastboot"
+ return 0
+ fi
+
ebegin "Checking local filesystems"
for p in ${fsck_passno}; do
local IFS="${_IFS}"
diff --git a/init.d/root.in b/init.d/root.in
index c87b7f1b..aba6415f 100644
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -13,7 +13,7 @@ depend()
start()
{
if echo 2>/dev/null >/.test.$$; then
- rm -f /.test.$$
+ rm -f /.test.$$ /fastboot
return 0
fi
@@ -23,4 +23,5 @@ start()
*) mount -u -o rw /;;
esac
eend $? "Root filesystem could not be mounted read/write"
+ rm -f /fastboot
}