[Glibc-bsd-commits] r5263 - trunk/freebsd-utils/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-27 13:00:38 +0000 (Fri, 27 Dec 2013)
New Revision: 5263

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/freebsd-utils.init
   trunk/freebsd-utils/debian/freebsd-utils.install
   trunk/freebsd-utils/debian/rules
Log:
Add /etc/sysctl.conf. It used to be provided by procps, but now it isn't. Its content is kernel-specific anyway, so let's just use the FreeBSD version.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-12-26 01:14:05 UTC (rev 5262)
+++ trunk/freebsd-utils/debian/changelog	2013-12-27 13:00:38 UTC (rev 5263)
@@ -1,3 +1,11 @@
+freebsd-utils (9.2+ds2-1) UNRELEASED; urgency=low
+
+  * Add /etc/sysctl.conf. It used to be provided by procps, but now it
+    isn't. Its content is kernel-specific anyway, so let's just use the
+    FreeBSD version.
+
+ -- Robert Millan <rmh at debian.org>  Fri, 27 Dec 2013 13:59:57 +0100
+
 freebsd-utils (9.2+ds1-1) unstable; urgency=low
 
   * Drop freebsd-geom transitional package.

Modified: trunk/freebsd-utils/debian/freebsd-utils.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.init	2013-12-26 01:14:05 UTC (rev 5262)
+++ trunk/freebsd-utils/debian/freebsd-utils.init	2013-12-27 13:00:38 UTC (rev 5263)
@@ -15,6 +15,9 @@
 
 . /lib/lsb/init-functions
 
+# Comment this out for sysctl to print every item changed
+QUIET_SYSCTL="-q"
+
 case "$1" in
   start)
     if [ "$(readlink /etc/mtab)" != "/proc/mounts" ] ; then
@@ -64,6 +67,19 @@
       mount -t fdescfs fdescfs /dev/fd
     fi
     log_action_end_msg 0
+
+	log_action_begin_msg "Setting kernel variables "
+	STATUS=0
+	for file in /etc/sysctl.conf ; do
+		if [ -r "$file" ] ; then
+			if [ "$VERBOSE" = "yes" ] ; then
+				log_action_cont_msg " $file"
+			fi
+			sysctl $QUIET_SYSCTL -p "$file" || STATUS=$?
+		fi
+	done
+	log_action_end_msg $STATUS
+
     ;;
 
   stop|reload|restart|force-reload)

Modified: trunk/freebsd-utils/debian/freebsd-utils.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.install	2013-12-26 01:14:05 UTC (rev 5262)
+++ trunk/freebsd-utils/debian/freebsd-utils.install	2013-12-27 13:00:38 UTC (rev 5263)
@@ -3,6 +3,7 @@
 sbin/mount				/bin
 sbin/umount				/lib/freebsd
 sbin/sysctl				/lib/freebsd
+src/etc/sysctl.conf			/etc
 
 debian/local/devfs.d/*			/etc/devfs.d
 debian/local/scripts/bin/sysctl		/sbin

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2013-12-26 01:14:05 UTC (rev 5262)
+++ trunk/freebsd-utils/debian/rules	2013-12-27 13:00:38 UTC (rev 5263)
@@ -87,7 +87,8 @@
 		$(ORIGDIR)/src/include/rpcsvc \
 		$(ORIGDIR)/src/{bin,sbin,usr.bin,usr.sbin} \
 		$(NULL)
-	for i in sbin/dmesg sbin/sysctl \
+	for i in sbin/dmesg \
+		sbin/sysctl etc/sysctl.conf \
 		\
 		bin/Makefile.inc \
 		sbin/Makefile.inc \