diff options
| -rwxr-xr-x | sh.BSD/init.sh | 17 | ||||
| -rwxr-xr-x | sh.Linux/init.sh | 30 | ||||
| -rw-r--r-- | sh/Makefile | 3 | ||||
| -rw-r--r-- | sh/init-functions.sh | 88 |
4 files changed, 22 insertions, 116 deletions
diff --git a/sh.BSD/init.sh b/sh.BSD/init.sh index 2133fce7..98e265b0 100755 --- a/sh.BSD/init.sh +++ b/sh.BSD/init.sh @@ -42,28 +42,27 @@ mount_svcdir() { if [ -e "${RC_SVCDIR}"/deptree ]; then dotmp=true if ! mount -t tmpfs none "${RC_LIBDIR}"/tmp 2>/dev/null; then - try mdconfig -a -t malloc -s 1m -u 1 - try newfs /dev/md1 - try mount /dev/md1 "${RC_LIBDIR}"/tmp + mdconfig -a -t malloc -s 1m -u 1 + newfs /dev/md1 + mount /dev/md1 "${RC_LIBDIR}"/tmp release=true fi cp -p "${RC_SVCDIR}"/deptree "${RC_SVCDIR}"/depconfig \ "${RC_SVCDIR}"/nettree "${RC_LIBDIR}"/tmp 2>/dev/null fi if ! mount -t tmpfs -o rw,noexec,nosuid none "${RC_SVCDIR}" 2>/dev/null; then - try mdconfig -a -t malloc -s "${rc_svcsize:-1024}"k -u 0 - try newfs -b 4096 -i 1024 -n /dev/md0 - try mount -o rw,noexec,nosuid /dev/md0 "${RC_SVCDIR}" + mdconfig -a -t malloc -s "${rc_svcsize:-1024}"k -u 0 + newfs -b 4096 -i 1024 -n /dev/md0 + mount -o rw,noexec,nosuid /dev/md0 "${RC_SVCDIR}" fi if ${dotmp}; then cp -p "${RC_LIBDIR}"/tmp/deptree "${RC_LIBDIR}"/tmp/depconfig \ "${RC_LIBDIR}"/tmp/nettree "${RC_SVCDIR}" 2>/dev/null - try umount "${RC_LIBDIR}"/tmp - ${release} && try mdconfig -d -u 1 + umount "${RC_LIBDIR}"/tmp + ${release} && mdconfig -d -u 1 fi } -. "${RC_LIBDIR}"/sh/init-functions.sh . "${RC_LIBDIR}"/sh/functions.sh [ -r /etc/rc.conf ] && . /etc/rc.conf diff --git a/sh.Linux/init.sh b/sh.Linux/init.sh index dc9ee5d6..ea9e457c 100755 --- a/sh.Linux/init.sh +++ b/sh.Linux/init.sh @@ -66,8 +66,8 @@ mount_svcdir() { devtmp="/dev/ram1" fs="ext2" for x in ${devdir} ${devtmp}; do - try dd if=/dev/zero of="${x}" bs=1k count="${rc_svcsize:-1024}" - try mkfs -t "${fs}" -i 1024 -vm0 "${x}" "${rc_svcsize:-1024}" + dd if=/dev/zero of="${x}" bs=1k count="${rc_svcsize:-1024}" + mkfs -t "${fs}" -i 1024 -vm0 "${x}" "${rc_svcsize:-1024}" done else echo @@ -80,22 +80,22 @@ mount_svcdir() { local dotmp=false if [ -e "${RC_SVCDIR}"/deptree ]; then dotmp=true - try mount -n -t "${fs}" -o rw "${devtmp}" "${RC_LIBDIR}"/tmp + mount -n -t "${fs}" -o rw "${devtmp}" "${RC_LIBDIR}"/tmp cp -p "${RC_SVCDIR}"/deptree "${RC_SVCDIR}"/depconfig \ "${RC_SVCDIR}"/nettree "${RC_LIBDIR}"/tmp 2>/dev/null fi # If we have no entry in fstab for $svcdir, provide our own if fstabinfo --quiet "${RC_SVCDIR}"; then - try mount -n "${RC_SVCDIR}" + mount -n "${RC_SVCDIR}" else - try mount -n -t "${fs}" ${fsopts} "${devdir}" "${RC_SVCDIR}" + mount -n -t "${fs}" ${fsopts} "${devdir}" "${RC_SVCDIR}" fi if ${dotmp}; then cp -p "${RC_LIBDIR}"/tmp/deptree "${RC_LIBDIR}"/tmp/depconfig \ "${RC_LIBDIR}"/tmp/nettree "${RC_SVCDIR}" 2>/dev/null - try umount -n "${RC_LIBDIR}"/tmp + umount -n "${RC_LIBDIR}"/tmp fi } @@ -128,7 +128,6 @@ KV_to_int() { } . /etc/init.d/functions.sh -. "${RC_LIBDIR}"/sh/init-functions.sh . "${RC_LIBDIR}"/sh/rc-functions.sh [ -r /etc/conf.d/rc ] && . /etc/conf.d/rc [ -r /etc/rc.conf ] && . /etc/rc.conf @@ -144,8 +143,6 @@ if [ -n "${dmesg_level}" -a "${RC_SYS}" != "VPS" ]; then dmesg -n "${dmesg_level}" fi -check_statedir /proc - # By default VServer already has /proc mounted, but OpenVZ does not! # However, some of our users have an old proc image in /proc # NFC how they managed that, but the end result means we have to test if @@ -169,9 +166,9 @@ if ${mountproc}; then [ "${RC_UNAME}" = "GNU/kFreeBSD" ] && proc="linprocfs" ebegin "Mounting ${procfs} at /proc" if fstabinfo --quiet /proc; then - try mount -n /proc + mount -n /proc else - try mount -n -t "${procfs}" -o noexec,nosuid,nodev proc /proc + mount -n -t "${procfs}" -o noexec,nosuid,nodev proc /proc fi eend $? fi @@ -193,9 +190,9 @@ if [ "${RC_UNAME}" != "GNU/kFreeBSD" -a "${RC_SYS}" != "VPS" -a "${K26}" = "0" ] if ! mountinfo --quiet /sys; then ebegin "Mounting sysfs at /sys" if fstabinfo --quiet /sys; then - try mount -n /sys + mount -n /sys else - try mount -n -t sysfs -o noexec,nosuid,nodev sysfs /sys + mount -n -t sysfs -o noexec,nosuid,nodev sysfs /sys fi eend $? fi @@ -204,7 +201,6 @@ if [ "${RC_UNAME}" != "GNU/kFreeBSD" -a "${RC_SYS}" != "VPS" -a "${K26}" = "0" ] fi fi -check_statedir /dev devfs_mounted= if [ -e /dev/.devfsd ]; then # make sure devfs is actually mounted and it isnt a bogus file @@ -267,9 +263,9 @@ for x in "devpts /dev/pts 0755 ,gid=5,mode=0620" "tmpfs /dev/shm 1777 ,nodev"; d if [ -d "$2" ]; then ebegin "Mounting $1 at $2" if fstabinfo --quiet "$2"; then - try mount -n "$2" + mount -n "$2" else - try mount -n -t "$1" -o noexec,nosuid"$4" none "$2" + mount -n -t "$1" -o noexec,nosuid"$4" none "$2" fi eend $? fi @@ -280,7 +276,7 @@ if [ -f /sbin/livecd-functions.sh -a -n "${CDBOOT}" ]; then ebegin "Updating inittab" livecd_fix_inittab eend $? - /sbin/telinit q &>/dev/null + telinit q &>/dev/null fi . "${RC_LIBDIR}"/sh/init-common-post.sh diff --git a/sh/Makefile b/sh/Makefile index dfac610f..e34d8307 100644 --- a/sh/Makefile +++ b/sh/Makefile @@ -1,6 +1,5 @@ DIR = $(RC_LIB)/sh -INC = functions.sh init-functions.sh init-common-post.sh \ - rc-functions.sh rc-mount.sh +INC = functions.sh init-common-post.sh rc-functions.sh rc-mount.sh BIN = gendepends.sh net.sh rc-mount.sh rc-help.sh runscript.sh TOPDIR = .. diff --git a/sh/init-functions.sh b/sh/init-functions.sh deleted file mode 100644 index 7afcf2b1..00000000 --- a/sh/init-functions.sh +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Copyright 2007 Roy Marples -# All rights reserved - -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -# void try(command) -# -# Try to execute 'command', if it fails, drop to a shell. -# -try() { - local errstr - local retval=0 - - if [ -c /dev/null ]; then - errstr=$(eval $* 2>&1 >/dev/null) - else - errstr=$(eval $* 2>&1) - fi - retval=$? - if [ ${retval} -ne 0 ]; then - #splash "critical" & - eend 1 - eerror "The \"$*\" command failed with error:" - eerror " ${errstr#*: }" - echo - eerror "Since this is a critical task, startup cannot continue." - echo - single_user - fi - - return ${retval} -} - -# bool check_statedir(dir) -# -# Check that 'dir' exists, if not, drop to a shell. -# -check_statedir() { - [ -z "$1" ] && return 0 - - if [ ! -d "$1" ]; then - if ! mkdir -p "$1" &>/dev/null; then - #splash "critical" & - echo - eerror "To function properly, \"$1\" needs to exist." - if yesno ${rc_force_auto:-${RC_FORCE_AUTO}}; then - eerror "Attempting to create \"$1\" for you ..." - if [ "${RC_UNAME}" = "Linux" ]; then - mount -o remount,rw / - else - mount -u -o rw / - fi - mkdir -p "$1" - fi - if [ ! -d "$1" ]; then - eerror "Please mount your root partition read/write, and execute:" - echo - eerror " # mkdir -p $1" - echo; echo - single_user - fi - fi - fi - - return 0 -} - -# vim: set ts=4 : |