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

[Aurelien Jarno]

Author: aurel32
Date: 2006-11-07 15:37:07 +0100 (Tue, 07 Nov 2006)
New Revision: 1704

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/module-init-tools.init.d
Log:
  [ Aurelien Jarno ]
  * Bumped Standards-Version to 3.7.2 (no changes).
  * Add LSB section to /etc/init.d/module-init-tools
  * Add start/stop options to /etc/init.d/module-init-tools
  * Drop/adjust dependencies on non-official version of the glibc.



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-11-03 22:51:43 UTC (rev 1703)
+++ trunk/freebsd-utils/debian/changelog	2006-11-07 14:37:07 UTC (rev 1704)
@@ -1,13 +1,19 @@
-freebsd-utils (6.1-0.1) UNRELEASED; urgency=low
+freebsd-utils (6.1-1) unreleased; urgency=low
 
   [ Petr Salinger ]
   * based on FreeBSD 6.1
   * again disable net-tools package (not yet ready to release)
-  * let wrapper around mount ignore "-O no_netdev", 
-	used in recent /etc/init.d/mountall.sh
+  * let wrapper around mount ignore "-O no_netdev",
+    used in recent /etc/init.d/mountall.sh
 
- -- Robert Millan <rmh at aybabtu.com>  Fri, 25 Aug 2006 09:46:47 +0200
+  [ Aurelien Jarno ]
+  * Bumped Standards-Version to 3.7.2 (no changes).
+  * Add LSB section to /etc/init.d/module-init-tools
+  * Add start/stop options to /etc/init.d/module-init-tools
+  * Drop/adjust dependencies on non-official version of the glibc. 
 
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat,  4 Nov 2006 16:24:54 +0100
+
 freebsd-utils (6.0-2.really.5.4-0.7) UNRELEASED; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-11-03 22:51:43 UTC (rev 1703)
+++ trunk/freebsd-utils/debian/control	2006-11-07 14:37:07 UTC (rev 1704)
@@ -3,25 +3,25 @@
 Priority: required
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd6-buildutils, libkvm-dev (>= 6.1), libbsd-dev (>= 0.0-1.3), libc0.1-dev (>= 2.3.6-7+kbsd.r1540), flex | flex-old, kfreebsd-kernel-headers (>= 0.20), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd6-buildutils, libkvm-dev (>= 6.1), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.3.6-8), flex | flex-old, kfreebsd-kernel-headers (>= 0.20), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev
 # libkvm-dev: dmesg
 # libfreebsd (>= 0.0-5): ifconfig
 # libipx-dev: ifconfig
 # libkiconv-dev: mount_*
-# libc0.1-dev (>= 2.3.6-7+kbsd.r1540): ifconfig
-Standards-Version: 3.6.0
+# libc0.1-dev (>= 2.3.6-8): ifconfig
+Standards-Version: 3.7.2
 
 Package: freebsd-utils
 Essential: yes
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, libc0.1 (>= 2.3.6-3+kbsd.r1365), net-tools | freebsd-hackedutils
+Depends: ${shlibs:Depends}, net-tools | freebsd-hackedutils
 Replaces: freebsd-hackedutils (<= 5.2.1-29)
 Description: FreeBSD utilities needed for GNU/kFreeBSD.
  FreeBSD utilities needed for GNU/kFreeBSD.
 
 Package: module-init-tools
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, libc0.1 (>= 2.3.6-3+kbsd.r1365)
+Depends: ${shlibs:Depends}
 Conflicts: kldutils (<< 6.0-2.really.5.4-0.6)
 Replaces: kldutils (<< 6.0-2.really.5.4-0.6), freebsd-utils (<= 5.2.1-16)
 Description: tools for managing kFreeBSD modules

Modified: trunk/freebsd-utils/debian/module-init-tools.init.d
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.init.d	2006-11-03 22:51:43 UTC (rev 1703)
+++ trunk/freebsd-utils/debian/module-init-tools.init.d	2006-11-07 14:37:07 UTC (rev 1704)
@@ -1,4 +1,15 @@
 #! /bin/sh
+### BEGIN INIT INFO
+# Provides:          module-init-tools
+# Required-Start:
+# Required-Stop:
+# Should-Start:      checkroot
+# Should-stop:
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Process /etc/modules.
+# Description:       Load the modules listed in /etc/modules.
+### END INIT INFO
 #
 # skeleton	example file to build /etc/init.d/ scripts.
 #		This file should be used to construct scripts for /etc/init.d.
@@ -11,22 +22,42 @@
 #
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-for i in load stat unload ; do
-  which kld$i >/dev/null || exit 1
-done
-modules="`shopt -s nullglob ; cat /etc/modules /etc/modules.d/* \
-  | sed -e \"s/#.*//g\" -e \"/^\( \|\t\)*$/d\" | sort | uniq`"
 
-set -e
+do_start() {
+	for i in load stat unload ; do
+		which kld$i >/dev/null || exit 1
+	done
+	modules="`shopt -s nullglob ; cat /etc/modules /etc/modules.d/* \
+		 | sed -e \"s/#.*//g\" -e \"/^\( \|\t\)*$/d\" | sort | uniq`"
 
-for i in ${modules} ; do
-  if ! kldstat -n $i >/dev/null 2>/dev/null ; then
-    echo "Loading $i ..."
-    kldload $i || true
-    echo "... done."
-  else
-    echo "Not loading $i (already loaded)"
-  fi
-done
+	set -e
 
+	for i in ${modules} ; do
+		if ! kldstat -n $i >/dev/null 2>/dev/null ; then
+			echo "Loading $i ..."
+			kldload $i || true
+			echo "... done."
+		else
+			echo "Not loading $i (already loaded)"
+		fi
+	done
+}
+
+case "$1" in
+  start|"")
+	do_start
+	;;
+  restart|reload|force-reload)
+	echo "Error: argument '$1' not supported" >&2
+	exit 3
+	;;
+  stop)
+	# No-op
+	;;
+  *)
+	echo "Usage: mountall.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
 exit 0