emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always remount root rw if it's not

Browse Source
This commit is contained in:
Roy Marples 2007-10-09 21:10:53 +00:00
parent d468572206
commit 31c6cacb0a
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
init.d/checkroot
View File

@ -30,6 +30,11 @@ do_mtab() {
rm -f /etc/mtab~ /etc/mtab~~ rm -f /etc/mtab~ /etc/mtab~~
} }
root_rw() {
echo 2>/dev/null >/.test.$$ || return 1
rm -f /.test.$$
}
do_fsck() { do_fsck() {
local retval=0 opts= local retval=0 opts=
case "${RC_UNAME}" in case "${RC_UNAME}" in
@ -42,9 +47,8 @@ do_fsck() {
return 0 return 0
fi fi
if echo 2>/dev/null >/.test.$$ ; then if root_rw; then
einfo "root filesystem is mounted read-write - skipping" einfo "root filesystem is mounted read-write - skipping"
rm -f /.test.$$
return 0 return 0
fi fi
@ -106,18 +110,22 @@ do_fsck() {
fi fi
fi fi
ebegin "Remounting root filesystem read/write"
if [ "${RC_UNAME}" = "Linux" ] ; then
mount -n -o remount,rw /
else
mount -u -o rw /
fi
eend $? "Root filesystem could not be mounted read/write :("
} }
start() { start() {
do_fsck || return 1 do_fsck || return 1
if ! root_rw; then
ebegin "Remounting root filesystem read/write"
if [ "${RC_UNAME}" = "Linux" ] ; then
mount -n -o remount,rw /
else
mount -u -o rw /
fi
eend $? "Root filesystem could not be mounted read/write :("
return $?
fi
# Only Linux has mtab # Only Linux has mtab
[ "${RC_UNAME}" = "Linux" ] && do_mtab [ "${RC_UNAME}" = "Linux" ] && do_mtab