From 45044c9239ef5eb06a3cc9e5110131cd0d8210ef Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 4 Nov 2008 11:28:24 +0000 Subject: Typo --- init.d/mount-ro.in | 45 +++++++++++++++++++++++++++++++++++++++++++++ init.d/romount.in | 45 --------------------------------------------- init.d/savecache.in | 2 +- 3 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 init.d/mount-ro.in delete mode 100644 init.d/romount.in diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in new file mode 100644 index 00000000..e39384a3 --- /dev/null +++ b/init.d/mount-ro.in @@ -0,0 +1,45 @@ +#!@PREFIX@/sbin/runscript +# Copyright 2007-2008 Roy Marples +# All rights reserved. Released under the 2-clause BSD license. + +description="Re-mount filesytems read-only for a clean reboot." + +depend() +{ + need killprocs savecache + keyword noprefix noopenvz novserver +} + +start() +{ + # Flush all pending disk writes now + sync; sync + + ebegin "Remounting remaining filesystems read-only" + # We need the do_unmount function + . "${RC_LIBDIR}"/sh/rc-mount.sh + eindent + local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x= fs= + # RC_NO_UMOUNTS is an env var that can be set by plugins + local OIFS=$IFS SIFS=${IFS-y} IFS=$IFS + IFS=$IFS: + for x in ${no_umounts} ${RC_NO_UMOUNTS}; do + m="${m}|${x}" + done + if [ "${SIFS}" = y ]; then + IFS=$OIFS + else + unset IFS + fi + m="^(${m})$" + fs= + for x in ${net_fs_list}; do + fs="${fs}${fs:+|}${x}" + done + [ -n "${fs}" ] && fs="^(${fs})$" + do_unmount "mount -n -o remount,ro" \ + --skip-point-regex "${m}" \ + ${fs:+--skip-fstype-regex} ${fs} --nonetdev + eoutdent + eend $? +} diff --git a/init.d/romount.in b/init.d/romount.in deleted file mode 100644 index e39384a3..00000000 --- a/init.d/romount.in +++ /dev/null @@ -1,45 +0,0 @@ -#!@PREFIX@/sbin/runscript -# Copyright 2007-2008 Roy Marples -# All rights reserved. Released under the 2-clause BSD license. - -description="Re-mount filesytems read-only for a clean reboot." - -depend() -{ - need killprocs savecache - keyword noprefix noopenvz novserver -} - -start() -{ - # Flush all pending disk writes now - sync; sync - - ebegin "Remounting remaining filesystems read-only" - # We need the do_unmount function - . "${RC_LIBDIR}"/sh/rc-mount.sh - eindent - local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|${RC_SVCDIR}" x= fs= - # RC_NO_UMOUNTS is an env var that can be set by plugins - local OIFS=$IFS SIFS=${IFS-y} IFS=$IFS - IFS=$IFS: - for x in ${no_umounts} ${RC_NO_UMOUNTS}; do - m="${m}|${x}" - done - if [ "${SIFS}" = y ]; then - IFS=$OIFS - else - unset IFS - fi - m="^(${m})$" - fs= - for x in ${net_fs_list}; do - fs="${fs}${fs:+|}${x}" - done - [ -n "${fs}" ] && fs="^(${fs})$" - do_unmount "mount -n -o remount,ro" \ - --skip-point-regex "${m}" \ - ${fs:+--skip-fstype-regex} ${fs} --nonetdev - eoutdent - eend $? -} diff --git a/init.d/savecache.in b/init.d/savecache.in index 57ed50ce..69c75e98 100644 --- a/init.d/savecache.in +++ b/init.d/savecache.in @@ -19,7 +19,7 @@ start() [ -e "${RC_SVCDIR}/${x}" ] && save="${save} ${RC_SVCDIR}/${x}" done if [ -n "${save}" ]; then - cp -p ${save} "${RC_LIBDIR}"/cache 2>/devnull + cp -p ${save} "${RC_LIBDIR}"/cache 2>/dev/null fi eend $? } -- cgit v1.2.3