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

Remove rc_force_auto as users can now specify -y in fsck_args.

Browse Source
This commit is contained in:
Roy Marples 2008-01-31 17:18:39 +00:00
parent 492a8f87cf
commit cf567c844f
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf.d/fsck
View File

@ -1,3 +1,7 @@
# Pass any arguments to fsck.
# By default we preen.
fsck="-p"
# fsck_shutdown causes fsck to trigger during shutdown as well as startup. # fsck_shutdown causes fsck to trigger during shutdown as well as startup.
# The end result of this is that if any periodic non-root filesystem checks are # The end result of this is that if any periodic non-root filesystem checks are
# scheduled, under normal circumstances the actual check will happen during # scheduled, under normal circumstances the actual check will happen during

7
etc/rc.conf
View File

@ -41,13 +41,6 @@ rc_coldplug="YES"
# This allows net.wlan and any service not matching net.* to be plugged. # This allows net.wlan and any service not matching net.* to be plugged.
rc_plug_services="" rc_plug_services=""
# rc_force_auto tries its best to prevent user interaction during the boot and
# shutdown process. For example, fsck will automatically be run or volumes
# remounted to create proper directory trees. This feature can be dangerous
# and is meant ONLY for headless machines where getting a physical console
# hooked up is a huge pita.
rc_force_auto="NO"
# rc_logger launches a logging daemon to log the entire rc process to # rc_logger launches a logging daemon to log the entire rc process to
# /var/log/rc.log # /var/log/rc.log
rc_logger="NO" rc_logger="NO"

3
init.d/fsck
View File

@ -13,7 +13,6 @@ depend()
start() start()
{ {
local retval=0 opts= root=
if [ "${RC_UNAME}" = "Linux" ]; then if [ "${RC_UNAME}" = "Linux" ]; then
opts="${opts} -A -C0 -T" opts="${opts} -A -C0 -T"
if echo 2>/dev/null >/.test.$$; then if echo 2>/dev/null >/.test.$$; then
@ -23,7 +22,7 @@ start()
fi fi
ebegin "Checking local filesystems" ebegin "Checking local filesystems"
fsck -p ${opts} fsck ${fsck_args-p} ${opts}
case $? in case $? in
0) eend 0; return 0;; 0) eend 0; return 0;;
1) ewend 1 "Filesystems repaired"; return 0;; 1) ewend 1 "Filesystems repaired"; return 0;;