Convert mount scripts to use /etc/rc.common.

4 files changed, 20 insertions, 87 deletions

diff --git a/src.etc/init.d/mountall b/src.etc/init.d/mountall
index 4882427..1e15f03 100755
--- a/src.etc/init.d/mountall
+++ b/src.etc/init.d/mountall
@@ -1,20 +1,7 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 
 start()
 {
-	printf 'Mounting file systems... '
+	log 'Mounting file systems'
 	[ -r /etc/fstab ] && mount -a
-	printf 'done.\n'
 }
-
-case "${1}" in
-	start)
-		start
-		;;
-	stop)
-		;;
-	*)
-		printf 'Usage: %s {start|stop}\n' "${0}" >&2
-		exit 1
-		;;
-esac
diff --git a/src.etc/init.d/mountdevsubfs b/src.etc/init.d/mountdevsubfs
index 5ef7235..bb976c8 100755
--- a/src.etc/init.d/mountdevsubfs
+++ b/src.etc/init.d/mountdevsubfs
@@ -1,41 +1,21 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 
 start()
 {
-	printf 'Mounting device file systems... '
-
+	log 'Mounting device file systems'
 	[ -d /dev/pts ] || mkdir -m 0755 /dev/pts
 	if ! mount | grep -Fq ' /dev/pts '; then
-		mount -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts
+		mount -t devpts -o noexec,nosuid,gid=5,mode=0620 \
+			devpts /dev/pts
 	fi
-
 	ln -sf /run/shm /dev/shm
-
-	printf 'done.\n'
 }
 
 stop()
 {
-	printf 'Unmounting device file systems... '
-
+	log 'Unmounting device file systems'
 	if mount | grep -Fq ' /dev/pts '; then
 		umount /dev/pts
 	fi
-
 	rm -f /dev/shm
-
-	printf 'done.\n'
 }
-
-case "${1}" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	*)
-		printf 'Usage: %s {start|stop}\n' "${0}" >&2
-		exit 1
-		;;
-esac
diff --git a/src.etc/init.d/mountkernfs b/src.etc/init.d/mountkernfs
index 8a701a8..108a550 100755
--- a/src.etc/init.d/mountkernfs
+++ b/src.etc/init.d/mountkernfs
@@ -1,30 +1,17 @@
-#!/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'
+	[ ! -e /proc/mounts ] && mount -t proc -o nodev,noexec,nosuid \
+		proc /proc
+	[ ! -e /sys/kernel ] && mount -t sysfs -o nodev,noexec,nosuid \
+		sysfs /sys
 }
 
 stop()
 {
-	printf 'Unmounting kernel virtual file systems... '
+	log 'Unmounting kernel virtual file systems'
 	[ -e /proc/mounts ] && umount /proc
 	[ -e /sys/kernel ] && umount /sys
-	printf 'done.\n'
 }
-
-case "${1}" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	*)
-		printf 'Usage: %s {start|stop}\n' "${0}" >&2
-		exit 1
-		;;
-esac
diff --git a/src.etc/init.d/mounttmpfs b/src.etc/init.d/mounttmpfs
index 96b398e..269ba74 100755
--- a/src.etc/init.d/mounttmpfs
+++ b/src.etc/init.d/mounttmpfs
@@ -1,47 +1,26 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 
 start()
 {
-	printf 'Mounting temporary file systems... '
-
+	log 'Mounting temporary file systems'
 	if ! mount | grep -Fq ' /run '; then
-		mount -t tmpfs -o nodev,noexec,nosuid,mode=0755 tmpfs /run
+		mount -t tmpfs -o nodev,noexec,nosuid,mode=0755 \
+			tmpfs /run
 	fi
-
 	[ -d /run/lock ] || mkdir -m 1777 /run/lock
 	[ -d /run/shm ] || mkdir -m 1777 /run/shm
-
 	if ! mount | grep -Fq ' /tmp '; then
 		mount -t tmpfs -o nodev,nosuid,mode=1777 tmpfs /tmp
 	fi
-
-	printf 'done.\n'
 }
 
 stop()
 {
-	printf 'Unmounting temporary file systems... '
-
+	log 'Unmounting temporary file systems'
 	if mount | grep -Fq ' /run '; then
 		umount /run
 	fi
-
 	if mount | grep -Fq ' /tmp '; then
-		umount /run
+		umount /tmp
 	fi
-
-	printf 'done.\n'
 }
-
-case "${1}" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	*)
-		printf 'Usage: %s {start|stop}\n' "${0}" >&2
-		exit 1
-		;;
-esac