From: ccsmart <ccsmart@smartpal.de>
Date: Mon, 15 Aug 2005 18:59:01 +0000 (+0000)
Subject: Add support for /etc/sysctl.conf .
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eddaed4476f9768827c89933ca3581612bbc1a9;p=openembedded.git

Add support for /etc/sysctl.conf .
---

diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh
index ed46b222d2..814dba676c 100755
--- a/packages/initscripts/initscripts-1.0/bootmisc.sh
+++ b/packages/initscripts/initscripts-1.0/bootmisc.sh
@@ -22,6 +22,20 @@ then
 	chown root:tty /dev/tty[p-za-e][0-9a-f]
 fi
 
+#
+# Apply /proc settings if defined
+#
+SYSCTL_CONF="/etc/sysctl.conf"
+if [ -f "${SYSCTL_CONF}" ]
+then
+	if [ -x "/sbin/sysctl" ]
+	then
+		/sbin/sysctl -p "${SYSCTL_CONF}"
+	else
+		echo "To have ${SYSCTL_CONF} applied during boot, install package <procps>."
+	fi
+fi
+
 #
 # Update /etc/motd.
 #
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 99b2a7dfbd..d2160c0e29 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r54"
+PR = "r55"
 
 SRC_URI = "file://halt \
            file://ramdisk \