From 6c19757e1503939eaa018f7f72bc2209d8a747b1 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Wed, 18 May 2011 22:40:24 +0000
Subject: Restore running custom scripts under /usr/local/etc/rc.d directory
 since it causes regressions and its a feature used by many users.

---
 etc/rc.start_packages | 35 +++++++++++++++++++++++++++++------
 etc/rc.stop_packages  | 33 ++++++++++++++++++++++++++++-----
 2 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/etc/rc.start_packages b/etc/rc.start_packages
index 485e319..ddd288d 100755
--- a/etc/rc.start_packages
+++ b/etc/rc.start_packages
@@ -36,15 +36,38 @@ require_once("shaper.inc");
 require_once("captiveportal.inc");
 require_once("pkg-utils.inc");
 require_once("pfsense-utils.inc");
-
-if (!is_array($config['installedpackages']['package']))
-	return;
+require_once("service-utils.inc");
 
 log_error("Restarting/Starting all packages.");
 
-foreach($config['installedpackages']['package'] as $package) {
-	sync_package($package['name']);
-	start_service($package['name']);
+$rcfiles = glob("{$rcfileprefix}*.sh");
+if (!$rcfiles)
+	$rcfiles = array();
+else {
+	$rcfiles = array_flip($rcfiles);
+	if (!$rcfiles)
+		$rcfiles = array();
+}
+
+if (is_array($config['installedpackages']['package'])) {
+	foreach($config['installedpackages']['package'] as $package) {
+		echo " Starting package {$package['name']}...";
+		sync_package($package['name']);
+		start_service($package['name']);
+		unset($rcfiles["{$rcfileprefix}{$package['name']}.sh"]);
+		echo "done.\n";
+	}
+}
+
+$shell = @popen("/bin/sh", "w");
+if ($shell) {
+	foreach ($rcfiles as $rcfile) {
+		echo " Starting {$rcfile}...";
+		fwrite($shell, "{$rcfile} start >>/tmp/bootup_messages 2>&1 &");
+		echo "done.\n";
+	}
+
+	pclose($shell);
 }
 
 ?>
diff --git a/etc/rc.stop_packages b/etc/rc.stop_packages
index dd031d4..181d2ea 100755
--- a/etc/rc.stop_packages
+++ b/etc/rc.stop_packages
@@ -36,13 +36,36 @@ require_once("shaper.inc");
 require_once("captiveportal.inc");
 require_once("pkg-utils.inc");
 require_once("pfsense-utils.inc");
-
-if (!is_array($config['installedpackages']['package']))
-	return;
+require_once("service-utils.inc");
 
 log_error("Stopping all packages.");
 
-foreach($config['installedpackages']['package'] as $package)
-	stop_service($package['name']);
+$rcfiles = glob("{$rcfileprefix}*.sh");
+if (!$rcfiles)
+        $rcfiles = array();
+else {
+	$rcfiles = array_flip($rcfiles);
+	if (!$rcfiles)
+		$rcfiles = array();
+}
+
+if (is_array($config['installedpackages']['package'])) {
+	foreach($config['installedpackages']['package'] as $package) {
+		echo " Stoping package {$package['name']}...";
+		stop_service($package['name']);
+		unset($rcfiles["{$rcfileprefix}{$package['name']}.sh"]);
+		echo "done.\n";
+	}
+}
+
+$shell = @popen("/bin/sh", "w");
+if ($shell) {
+        foreach ($rcfiles as $rcfile) {
+		echo " Stoping {$rcfile}...";
+                fwrite($shell, "{$rcfile} stop >>/tmp/bootup_messages 2>&1");
+		echo "done.\n";
+	}
 
+        pclose($shell);
+}
 ?>
-- 
cgit v1.1