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

[Robert Millan]

Author: rmh
Date: 2006-04-26 16:41:27 +0000 (Wed, 26 Apr 2006)
New Revision: 1499

Added:
   trunk/freebsd-utils/debian/module-init-tools.init.d
   trunk/freebsd-utils/debian/module-init-tools.install
   trunk/freebsd-utils/debian/module-init-tools.links
Removed:
   trunk/freebsd-utils/debian/kbdcontrol.templates
   trunk/freebsd-utils/debian/kldutils.init.d
   trunk/freebsd-utils/debian/kldutils.install
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/rules
Log:
Rename kldutils to module-init-tools, and provide alias commands (symlinks) for insmod, rmmod, modprobe and lsmod.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-04-26 16:04:03 UTC (rev 1498)
+++ trunk/freebsd-utils/debian/changelog	2006-04-26 16:41:27 UTC (rev 1499)
@@ -1,8 +1,10 @@
 freebsd-utils (6.0-2.really.5.4-0.5) UNRELEASED; urgency=low
 
   * scripts/bin/sysctl: s,sysctl.real,/lib/freebsd/sysctl,g
+  * Rename kldutils to module-init-tools, and provide alias commands
+    (symlinks) for insmod, rmmod, modprobe and lsmod.
 
- -- Robert Millan <rmh at aybabtu.com>  Tue, 18 Apr 2006 09:45:30 +0200
+ -- Robert Millan <rmh at aybabtu.com>  Wed, 26 Apr 2006 18:41:12 +0200
 
 freebsd-utils (6.0-2.really.5.4-0.4) unreleased; urgency=low
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-04-26 16:04:03 UTC (rev 1498)
+++ trunk/freebsd-utils/debian/control	2006-04-26 16:41:27 UTC (rev 1499)
@@ -13,10 +13,12 @@
 Description: FreeBSD utilities needed for GNU/kFreeBSD.
  FreeBSD utilities needed for GNU/kFreeBSD.
 
-Package: kldutils
+Package: module-init-tools
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}, libc0.1 (>= 2.3.6-3+kbsd.r1365)
-Replaces: freebsd-utils (<= 5.2.1-16)
+Conflicts: kldutils
+Provides: kldutils
+Replaces: kldutils, freebsd-utils (<= 5.2.1-16)
 Description: tools for managing kFreeBSD modules
  This package contains a set of programs for loading, inserting, and
  removing kernel modules for kFreeBSD.

Deleted: trunk/freebsd-utils/debian/kbdcontrol.templates
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.templates	2006-04-26 16:04:03 UTC (rev 1498)
+++ trunk/freebsd-utils/debian/kbdcontrol.templates	2006-04-26 16:41:27 UTC (rev 1499)
@@ -1,9 +0,0 @@
-Template: kbdcontrol/keymap
-Type: select
-Choices: none, ${choices}
-Default: none
-Description: Select keyboard map
- Select a map file for your keyboard.
- .
- Note: If you don't know, don't select any yet.  You can always come back to
- this question with "dpkg-reconfigure kldutils".

Deleted: trunk/freebsd-utils/debian/kldutils.init.d
===================================================================
--- trunk/freebsd-utils/debian/kldutils.init.d	2006-04-26 16:04:03 UTC (rev 1498)
+++ trunk/freebsd-utils/debian/kldutils.init.d	2006-04-26 16:41:27 UTC (rev 1499)
@@ -1,32 +0,0 @@
-#! /bin/sh
-#
-# skeleton	example file to build /etc/init.d/ scripts.
-#		This file should be used to construct scripts for /etc/init.d.
-#
-#		Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-#		Modified for Debian 
-#		by Ian Murdock <imurdock at gnu.ai.mit.edu>.
-#
-# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl
-#
-
-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
-
-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
-
-exit 0

Deleted: trunk/freebsd-utils/debian/kldutils.install
===================================================================
--- trunk/freebsd-utils/debian/kldutils.install	2006-04-26 16:04:03 UTC (rev 1498)
+++ trunk/freebsd-utils/debian/kldutils.install	2006-04-26 16:41:27 UTC (rev 1499)
@@ -1,4 +0,0 @@
-build-tree/src/sbin/kldload/kldload		/sbin
-build-tree/src/sbin/kldunload/kldunload		/sbin
-build-tree/src/sbin/kldstat/kldstat		/bin
-debian/modules					/etc

Copied: trunk/freebsd-utils/debian/module-init-tools.init.d (from rev 1486, trunk/freebsd-utils/debian/kldutils.init.d)

Copied: trunk/freebsd-utils/debian/module-init-tools.install (from rev 1486, trunk/freebsd-utils/debian/kldutils.install)

Added: trunk/freebsd-utils/debian/module-init-tools.links
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.links	2006-04-26 16:04:03 UTC (rev 1498)
+++ trunk/freebsd-utils/debian/module-init-tools.links	2006-04-26 16:41:27 UTC (rev 1499)
@@ -0,0 +1,4 @@
+/bin/kldstat		/bin/lsmod
+/sbin/kldload		/sbin/insmod
+/sbin/kldload		/sbin/modprobe
+/sbin/kldunload		/sbin/rmmod

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-04-26 16:04:03 UTC (rev 1498)
+++ trunk/freebsd-utils/debian/rules	2006-04-26 16:41:27 UTC (rev 1499)
@@ -21,7 +21,7 @@
 	done
 # FIXME: add mount_{xfs,cd9660,msdosfs,nfs,nfs4,ntfs,udf,umapfs},fdisk,bsdlabel
 
-build/kldutils:: apply-patches
+build/module-init-tools:: apply-patches
 	set -e ; for i in sbin/kld{load,stat,unload} \
 	; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \