From 9de16d22b0ac3cbb74793faa913db889d8151ee5 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Wed, 04 Jun 2014 23:08:41 -0400 Subject: Merge branch 'feature/init-system-improvements'. --- (limited to 'src.etc/init.d/mountkernfs') diff --git a/src.etc/init.d/mountkernfs b/src.etc/init.d/mountkernfs index 8a701a8..83d5179 100755 --- a/src.etc/init.d/mountkernfs +++ b/src.etc/init.d/mountkernfs @@ -1,30 +1,25 @@ -#!/bin/sh +#!/bin/sh /etc/rc.common start() { - printf 'Mounting kernel virtual file systems... ' - [ ! -e /proc/mounts ] && mount -t proc -o nodev,noexec,nosuid proc /proc - [ ! -e /sys/kernel ] && mount -t sysfs -o nodev,noexec,nosuid sysfs /sys - printf 'done.\n' + log 'Mounting kernel virtual file systems' + if ! [ -e /proc/mounts ]; then + mount -t proc -o nodev,noexec,nosuid proc /proc || \ + return ${?} + fi + if ! [ -e /sys/kernel ]; then + mount -t sysfs -o nodev,noexec,nosuid sysfs /sys || \ + return ${?} + fi } stop() { - printf 'Unmounting kernel virtual file systems... ' - [ -e /proc/mounts ] && umount /proc - [ -e /sys/kernel ] && umount /sys - printf 'done.\n' + log 'Unmounting kernel virtual file systems' + if [ -e /proc/mounts ]; then + umount /proc || return ${?} + fi + if [ -e /sys/kernel ]; then + umount /sys || return ${?} + fi } - -case "${1}" in - start) - start - ;; - stop) - stop - ;; - *) - printf 'Usage: %s {start|stop}\n' "${0}" >&2 - exit 1 - ;; -esac -- cgit v0.9.1