From 54ab12d2186d907ea8d7d882b6a9e0536fcc8f5c Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Sat, 11 Jan 2014 13:32:43 -0600
Subject: Merge init-common-post code into BSD init script

This code is no longer part of the initialization script for Linux, so
we can move it into the init script for *BSD which is the only place it
is used.
---
 sh/.gitignore             |  1 -
 sh/Makefile               |  4 ++--
 sh/init-common-post.sh.in | 25 -------------------------
 sh/init.sh.BSD.in         | 23 ++++++++++++++++++++++-
 4 files changed, 24 insertions(+), 29 deletions(-)
 delete mode 100644 sh/init-common-post.sh.in

(limited to 'sh')

diff --git a/sh/.gitignore b/sh/.gitignore
index 386c42f6..d5cb215a 100644
--- a/sh/.gitignore
+++ b/sh/.gitignore
@@ -1,6 +1,5 @@
 functions.sh
 gendepends.sh
-init-common-post.sh
 rc-functions.sh
 runscript.sh
 cgroup-release-agent.sh
diff --git a/sh/Makefile b/sh/Makefile
index 7307f63a..c1953f31 100644
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -1,7 +1,7 @@
 DIR=	${LIBEXECDIR}/sh
-SRCS=	init.sh.in functions.sh.in gendepends.sh.in init-common-post.sh.in \
+SRCS=	init.sh.in functions.sh.in gendepends.sh.in \
 	rc-functions.sh.in runscript.sh.in tmpfiles.sh.in ${SRCS-${OS}}
-INC=	init-common-post.sh rc-mount.sh functions.sh rc-functions.sh
+INC=	rc-mount.sh functions.sh rc-functions.sh
 BIN=	gendepends.sh init.sh runscript.sh tmpfiles.sh ${BIN-${OS}}
 
 INSTALLAFTER=	_installafter
diff --git a/sh/init-common-post.sh.in b/sh/init-common-post.sh.in
deleted file mode 100644
index 96eeeeef..00000000
--- a/sh/init-common-post.sh.in
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
-
-# mount $RC_SVCDIR as something we can write to if it's not rw
-# On vservers, / is always rw at this point, so we need to clean out
-# the old service state data
-: ${RC_LIBEXECDIR:=@LIBEXECDIR@}
-: ${RC_SVCDIR:=@LIBEXECDIR@/init.d}
-case "$(openrc --sys)" in
-	OPENVZ|VSERVER)	rm -rf "$RC_SVCDIR"/*;;
-	*)		if mountinfo --quiet "$RC_SVCDIR"; then
-				rm -rf "$RC_SVCDIR"/*
-			else
-				mount_svcdir
-			fi
-			;;
-esac
-retval=$?
-
-if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then
-	cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null
-fi
-
-echo sysinit >"$RC_SVCDIR"/softlevel
-exit $retval
diff --git a/sh/init.sh.BSD.in b/sh/init.sh.BSD.in
index 0bd3e9bc..2a53dcd8 100644
--- a/sh/init.sh.BSD.in
+++ b/sh/init.sh.BSD.in
@@ -29,4 +29,25 @@ if [ -z "$RC_SYS" -a "$RC_UNAME" = "FreeBSD" ]; then
 	sysctl hw.bus.devctl_disable=1 >/dev/null
 fi
 
-. "$RC_LIBEXECDIR"/sh/init-common-post.sh
+# mount $RC_SVCDIR as something we can write to if it's not rw
+# On vservers, / is always rw at this point, so we need to clean out
+# the old service state data
+: ${RC_LIBEXECDIR:=@LIBEXECDIR@}
+: ${RC_SVCDIR:=@LIBEXECDIR@/init.d}
+case "$(openrc --sys)" in
+	OPENVZ|VSERVER)	rm -rf "$RC_SVCDIR"/*;;
+	*)		if mountinfo --quiet "$RC_SVCDIR"; then
+				rm -rf "$RC_SVCDIR"/*
+			else
+				mount_svcdir
+			fi
+			;;
+esac
+retval=$?
+
+if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then
+	cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null
+fi
+
+echo sysinit >"$RC_SVCDIR"/softlevel
+exit $retval
-- 
cgit v1.2.3