[Glibc-bsd-commits] r2442 - trunk/freebsd-utils/debian
Guillem Jover
guillem at alioth.debian.org
Mon Apr 13 18:46:51 UTC 2009
Author: guillem
Date: 2009-04-13 18:46:51 +0000 (Mon, 13 Apr 2009)
New Revision: 2442
Added:
trunk/freebsd-utils/debian/freebsd-net-tools.install
trunk/freebsd-utils/debian/freebsd-net-tools.manpages
trunk/freebsd-utils/debian/freebsd-net-tools.postinst
trunk/freebsd-utils/debian/kldutils.config
trunk/freebsd-utils/debian/kldutils.dirs
trunk/freebsd-utils/debian/kldutils.init
trunk/freebsd-utils/debian/kldutils.install
trunk/freebsd-utils/debian/kldutils.links
trunk/freebsd-utils/debian/kldutils.manpages
trunk/freebsd-utils/debian/kldutils.postinst
trunk/freebsd-utils/debian/kldutils.templates
Removed:
trunk/freebsd-utils/debian/module-init-tools.config
trunk/freebsd-utils/debian/module-init-tools.dirs
trunk/freebsd-utils/debian/module-init-tools.init
trunk/freebsd-utils/debian/module-init-tools.install
trunk/freebsd-utils/debian/module-init-tools.links
trunk/freebsd-utils/debian/module-init-tools.manpages
trunk/freebsd-utils/debian/module-init-tools.postinst
trunk/freebsd-utils/debian/module-init-tools.templates
trunk/freebsd-utils/debian/net-tools.install
trunk/freebsd-utils/debian/net-tools.manpages
trunk/freebsd-utils/debian/net-tools.postinst
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/rules
Log:
Rename module-init-tools to kldutils and net-tools to freebsd-net-tools
As this is messing up the expectations of several services of equially
named binary coming from the same source package.
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/changelog 2009-04-13 18:46:51 UTC (rev 2442)
@@ -2,6 +2,9 @@
* Install a new bug control file to redirect bug report submissions to
the freebsd-utils package.
+ * Rename module-init-tools to kldutils and net-tools to freebsd-net-tools,
+ as this is messing up the expectations of several services of equially
+ named binary coming from the same source package.
-- Guillem Jover <guillem at debian.org> Mon, 13 Apr 2009 17:29:58 +0200
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/control 2009-04-13 18:46:51 UTC (rev 2442)
@@ -28,12 +28,13 @@
Description: FreeBSD utilities needed for GNU/kFreeBSD
This package contains FreeBSD utilities needed for GNU/kFreeBSD.
-Package: module-init-tools
+Package: kldutils
Priority: important
Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, kfreebsd-image
-Replaces: kldutils (<< 6.0-2.really.5.4-0.6), freebsd-utils (<= 5.2.1-16),
+Replaces: module-init-tools, freebsd-utils (<= 5.2.1-16),
freebsd-hackedutils (<= 6.1-1), kfreebsd-common (<< 6.1-6)
+Provides: module-init-tools
Description: tools for managing kFreeBSD modules
This package contains a set of programs for loading, inserting, and
removing kernel modules for kFreeBSD.
@@ -45,12 +46,13 @@
Original FreeBSD command to set keyboard layout and the FreeBSD possible
keyboards.
-Package: net-tools
+Package: freebsd-net-tools
Section: net
Priority: important
Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: freebsd-utils (<< 5.4), freebsd-hackedutils (<= 6.1-1)
+Replaces: freebsd-utils (<< 5.4), freebsd-hackedutils (<= 6.1-1), net-tools
+Provides: net-tools
Description: FreeBSD networking tools
This package contains the FreeBSD tools needed to manage networking on
GNU/kFreeBSD.
Copied: trunk/freebsd-utils/debian/freebsd-net-tools.install (from rev 2437, trunk/freebsd-utils/debian/net-tools.install)
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.install (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.install 2009-04-13 18:46:51 UTC (rev 2442)
@@ -0,0 +1,5 @@
+sbin/ifconfig/ifconfig /sbin
+sbin/route/route /lib/freebsd
+debian/scripts/sbin/route /sbin
+sbin/pfctl/pfctl /sbin
+usr.sbin/authpf/authpf /usr/sbin/
Copied: trunk/freebsd-utils/debian/freebsd-net-tools.manpages (from rev 2437, trunk/freebsd-utils/debian/net-tools.manpages)
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.manpages (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.manpages 2009-04-13 18:46:51 UTC (rev 2442)
@@ -0,0 +1,5 @@
+sbin/ifconfig/ifconfig.8
+sbin/route/route.8
+contrib/pf/authpf/authpf.8
+contrib/pf/pfctl/pfctl.8
+contrib/pf/man/*.5
Copied: trunk/freebsd-utils/debian/freebsd-net-tools.postinst (from rev 2437, trunk/freebsd-utils/debian/net-tools.postinst)
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.postinst (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.postinst 2009-04-13 18:46:51 UTC (rev 2442)
@@ -0,0 +1,27 @@
+#! /bin/sh
+set -e
+
+case "$1" in
+ configure)
+ if test -e /etc/network/options ; then
+ echo "Removing obsolete (and Linux-specific) /etc/network/options ..."
+ rm -f /etc/network/options
+ fi
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+
Copied: trunk/freebsd-utils/debian/kldutils.config (from rev 2437, trunk/freebsd-utils/debian/module-init-tools.config)
===================================================================
--- trunk/freebsd-utils/debian/kldutils.config (rev 0)
+++ trunk/freebsd-utils/debian/kldutils.config 2009-04-13 18:46:51 UTC (rev 2442)
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+if test -e /lib/modules/`uname -r` ; then
+ module_dir="/lib/modules/`uname -r`"
+else
+ module_dir="/boot/kernel"
+fi
+
+get_module_description ()
+{
+ if line=`grep "^$1[[:space:]]" /usr/share/kldutils/module_descriptions` ; then
+ echo ${line} | sed -e "s/^[^[:space:]]*[[:space:]]*/ (/g" -e "s/$/)/g"
+ fi
+ return 0
+}
+
+for i in `ls ${module_dir}/*.ko | sed -e "s,.*/,,g" -e "s/\.ko$//g"` ; do
+ case $i in
+ # acpi is handler by boot loader, linux/linprocfs are always loaded
+ acpi|linux|linprocfs) ;;
+ if_*)
+ if [ "${network}" = "" ] ; then
+ network="$i`get_module_description $i`"
+ else
+ network="${network}, $i`get_module_description $i`"
+ fi
+ ;;
+ snd_*|sound|speaker)
+ if [ "${sound}" = "" ] ; then
+ sound="$i`get_module_description $i`"
+ else
+ sound="${sound}, $i`get_module_description $i`"
+ fi
+ ;;
+ *)
+ if [ "${other}" = "" ] ; then
+ other="$i`get_module_description $i`"
+ else
+ other="${other}, $i`get_module_description $i`"
+ fi
+ ;;
+ esac
+done
+
+db_subst kldutils/network choices "$network"
+db_input high kldutils/network || true
+db_go
+
+db_subst kldutils/sound choices "$sound"
+db_input high kldutils/sound || true
+db_go
+
+db_subst kldutils/other choices "$other"
+db_input high kldutils/other || true
+db_go
Copied: trunk/freebsd-utils/debian/kldutils.dirs (from rev 2437, trunk/freebsd-utils/debian/module-init-tools.dirs)
===================================================================
--- trunk/freebsd-utils/debian/kldutils.dirs (rev 0)
+++ trunk/freebsd-utils/debian/kldutils.dirs 2009-04-13 18:46:51 UTC (rev 2442)
@@ -0,0 +1,3 @@
+etc/modules.d
+usr/sbin
+usr/share/kldutils
Copied: trunk/freebsd-utils/debian/kldutils.init (from rev 2437, trunk/freebsd-utils/debian/module-init-tools.init)
===================================================================
--- trunk/freebsd-utils/debian/kldutils.init (rev 0)
+++ trunk/freebsd-utils/debian/kldutils.init 2009-04-13 18:46:51 UTC (rev 2442)
@@ -0,0 +1,64 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: kldutils
+# 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.
+#
+# 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
+
+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\" `"
+# in previous line should be output of sed passed
+# through "| sort -u", but sort is located in /usr/bin/ :-(
+ 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: $0 [start|stop]" >&2
+ exit 3
+ ;;
+esac
+
+exit 0
Copied: trunk/freebsd-utils/debian/kldutils.install (from rev 2437, trunk/freebsd-utils/debian/module-init-tools.install)
===================================================================
--- trunk/freebsd-utils/debian/kldutils.install (rev 0)
+++ trunk/freebsd-utils/debian/kldutils.install 2009-04-13 18:46:51 UTC (rev 2442)
@@ -0,0 +1,7 @@
+sbin/kldload/kldload /sbin
+sbin/kldunload/kldunload /sbin
+sbin/kldconfig/kldconfig /sbin
+sbin/kldstat/kldstat /bin
+debian/modules /etc
+debian/scripts/sbin/snd_probe /usr/sbin
+debian/module_descriptions /usr/share/kldutils
Copied: trunk/freebsd-utils/debian/kldutils.links (from rev 2437, trunk/freebsd-utils/debian/module-init-tools.links)
===================================================================
--- trunk/freebsd-utils/debian/kldutils.links (rev 0)
+++ trunk/freebsd-utils/debian/kldutils.links 2009-04-13 18:46:51 UTC (rev 2442)
@@ -0,0 +1,4 @@
+/bin/kldstat /bin/lsmod
+/sbin/kldload /sbin/insmod
+/sbin/kldload /sbin/modprobe
+/sbin/kldunload /sbin/rmmod
Copied: trunk/freebsd-utils/debian/kldutils.manpages (from rev 2437, trunk/freebsd-utils/debian/module-init-tools.manpages)
===================================================================
--- trunk/freebsd-utils/debian/kldutils.manpages (rev 0)
+++ trunk/freebsd-utils/debian/kldutils.manpages 2009-04-13 18:46:51 UTC (rev 2442)
@@ -0,0 +1,4 @@
+sbin/kldload/kldload.8
+sbin/kldstat/kldstat.8
+sbin/kldunload/kldunload.8
+sbin/kldconfig/kldconfig.8
Copied: trunk/freebsd-utils/debian/kldutils.postinst (from rev 2437, trunk/freebsd-utils/debian/module-init-tools.postinst)
===================================================================
--- trunk/freebsd-utils/debian/kldutils.postinst (rev 0)
+++ trunk/freebsd-utils/debian/kldutils.postinst 2009-04-13 18:46:51 UTC (rev 2442)
@@ -0,0 +1,95 @@
+#! /bin/sh
+# postinst script for kfreebsd-common
+#
+# see: dh_installdeb(1)
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+get_modules ()
+ {
+ test -e /etc/modules.d/kldutils || return 0
+ sed -e "s/#.*//g" -e "/^\( \|\t\)*$/d" /etc/modules.d/kldutils \
+ | tr "\n" ":" | sed -e "s/ /:/g" -e "s/^://g" -e s/:$//g -e "s/::*/:/g"
+ }
+
+case "$1" in
+ configure)
+ # Transition from the old packages
+ if [ -e /etc/modules.d/kfreebsd-config ] ; then
+ mv -f /etc/modules.d/kfreebsd-config /etc/modules.d/kldutils
+ fi
+ if [ -e /etc/modules.d/module-init-tools ] ; then
+ mv -f /etc/modules.d/module-init-tools /etc/modules.d/kldutils
+ fi
+
+ # Save modules that old file requested. We might need to unload them
+ old="`get_modules`"
+ cat > /etc/modules.d/kldutils << EOF
+# Do not edit this file! It is automaticaly generated by kldutils
+# Use "dpkg-reconfigure kldutils" instead.
+EOF
+ for i in network sound other ; do
+ db_get kldutils/$i
+ for j in `echo "$RET" | sed -e "s/, /|/g" | tr "|" "\n" | sed -e "s/ .*//g"` ; do
+ echo "$j" >> /etc/modules.d/kldutils
+ done
+ done
+ new="`get_modules`"
+
+ # Unload modules that:
+ # a) were listed to be loaded in the old list
+ # b) are not listed to be loaded in the new list
+ # c) are actualy loaded
+ # d) are not acpi
+ OLDIFS="$IFS"
+ IFS=":"
+ for i in ${old} ; do case :${new}: in
+ *:$i:*|*:acpi:*)
+ ;;
+ *)
+ if kldstat -n $i >/dev/null 2>/dev/null ; then
+ echo "Unloading $i ..."
+ if ! kldunload $i ; then
+ # It could well be that the module is in use.
+ echo "Warning: failed to unload stale module $i, you may want to try manualy."
+ fi
+ else
+ echo "Not unloading $i (not loaded)"
+ fi
+ ;;
+ esac ; done
+ IFS="$OLDIFS"
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Copied: trunk/freebsd-utils/debian/kldutils.templates (from rev 2437, trunk/freebsd-utils/debian/module-init-tools.templates)
===================================================================
--- trunk/freebsd-utils/debian/kldutils.templates (rev 0)
+++ trunk/freebsd-utils/debian/kldutils.templates 2009-04-13 18:46:51 UTC (rev 2442)
@@ -0,0 +1,31 @@
+Template: kldutils/network
+Type: multiselect
+Choices: ${choices}
+_Description: Network card drivers:
+ Select the appropiate driver for your network cards. You may select more than
+ one driver, or none at all, depending on the number of cards you have.
+ .
+ Note: You most likely don't need any, since default kernels currently include
+ builtin support for many NICs. You can always come back to this question later
+ with "dpkg-reconfigure kldutils".
+
+Template: kldutils/sound
+Type: multiselect
+Choices: ${choices}
+_Description: Sound card drivers:
+ Select the appropiate driver for your sound cards. You may select more than
+ one driver, or none at all, depending on the number of cards you have.
+ .
+ Note: If you don't know, don't select any yet. Later, you can use the
+ snd_probe command to find it out. You can always come back to this question
+ with "dpkg-reconfigure kldutils".
+
+Template: kldutils/other
+Type: multiselect
+Choices: ${choices}
+_Description: Other modules:
+ Below is a selection of modules that don't fall in either of the previous
+ cathegories. Select those you find adequate.
+ .
+ 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/module-init-tools.config
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.config 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/module-init-tools.config 2009-04-13 18:46:51 UTC (rev 2442)
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-if test -e /lib/modules/`uname -r` ; then
- module_dir="/lib/modules/`uname -r`"
-else
- module_dir="/boot/kernel"
-fi
-
-get_module_description ()
-{
- if line=`grep "^$1[[:space:]]" /usr/share/module-init-tools/module_descriptions` ; then
- echo ${line} | sed -e "s/^[^[:space:]]*[[:space:]]*/ (/g" -e "s/$/)/g"
- fi
- return 0
-}
-
-for i in `ls ${module_dir}/*.ko | sed -e "s,.*/,,g" -e "s/\.ko$//g"` ; do
- case $i in
- # acpi is handler by boot loader, linux/linprocfs are always loaded
- acpi|linux|linprocfs) ;;
- if_*)
- if [ "${network}" = "" ] ; then
- network="$i`get_module_description $i`"
- else
- network="${network}, $i`get_module_description $i`"
- fi
- ;;
- snd_*|sound|speaker)
- if [ "${sound}" = "" ] ; then
- sound="$i`get_module_description $i`"
- else
- sound="${sound}, $i`get_module_description $i`"
- fi
- ;;
- *)
- if [ "${other}" = "" ] ; then
- other="$i`get_module_description $i`"
- else
- other="${other}, $i`get_module_description $i`"
- fi
- ;;
- esac
-done
-
-db_subst module-init-tools/network choices "$network"
-db_input high module-init-tools/network || true
-db_go
-
-db_subst module-init-tools/sound choices "$sound"
-db_input high module-init-tools/sound || true
-db_go
-
-db_subst module-init-tools/other choices "$other"
-db_input high module-init-tools/other || true
-db_go
Deleted: trunk/freebsd-utils/debian/module-init-tools.dirs
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.dirs 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/module-init-tools.dirs 2009-04-13 18:46:51 UTC (rev 2442)
@@ -1,3 +0,0 @@
-etc/modules.d
-usr/sbin
-usr/share/module-init-tools
Deleted: trunk/freebsd-utils/debian/module-init-tools.init
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.init 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/module-init-tools.init 2009-04-13 18:46:51 UTC (rev 2442)
@@ -1,64 +0,0 @@
-#! /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.
-#
-# 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
-
-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\" `"
-# in previous line should be output of sed passed
-# through "| sort -u", but sort is located in /usr/bin/ :-(
- 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: $0 [start|stop]" >&2
- exit 3
- ;;
-esac
-
-exit 0
Deleted: trunk/freebsd-utils/debian/module-init-tools.install
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.install 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/module-init-tools.install 2009-04-13 18:46:51 UTC (rev 2442)
@@ -1,7 +0,0 @@
-sbin/kldload/kldload /sbin
-sbin/kldunload/kldunload /sbin
-sbin/kldconfig/kldconfig /sbin
-sbin/kldstat/kldstat /bin
-debian/modules /etc
-debian/scripts/sbin/snd_probe /usr/sbin
-debian/module_descriptions /usr/share/module-init-tools
Deleted: trunk/freebsd-utils/debian/module-init-tools.links
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.links 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/module-init-tools.links 2009-04-13 18:46:51 UTC (rev 2442)
@@ -1,4 +0,0 @@
-/bin/kldstat /bin/lsmod
-/sbin/kldload /sbin/insmod
-/sbin/kldload /sbin/modprobe
-/sbin/kldunload /sbin/rmmod
Deleted: trunk/freebsd-utils/debian/module-init-tools.manpages
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.manpages 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/module-init-tools.manpages 2009-04-13 18:46:51 UTC (rev 2442)
@@ -1,4 +0,0 @@
-sbin/kldload/kldload.8
-sbin/kldstat/kldstat.8
-sbin/kldunload/kldunload.8
-sbin/kldconfig/kldconfig.8
Deleted: trunk/freebsd-utils/debian/module-init-tools.postinst
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.postinst 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/module-init-tools.postinst 2009-04-13 18:46:51 UTC (rev 2442)
@@ -1,92 +0,0 @@
-#! /bin/sh
-# postinst script for kfreebsd-common
-#
-# see: dh_installdeb(1)
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-get_modules ()
- {
- test -e /etc/modules.d/module-init-tools || return 0
- sed -e "s/#.*//g" -e "/^\( \|\t\)*$/d" /etc/modules.d/module-init-tools \
- | tr "\n" ":" | sed -e "s/ /:/g" -e "s/^://g" -e s/:$//g -e "s/::*/:/g"
- }
-
-case "$1" in
- configure)
- # Transition from the old package
- if [ -e /etc/modules.d/kfreebsd-config ] ; then
- mv -f /etc/modules.d/kfreebsd-config /etc/modules.d/module-init-tools
- fi
-
- # Save modules that old file requested. We might need to unload them
- old="`get_modules`"
- cat > /etc/modules.d/module-init-tools << EOF
-# Do not edit this file! It is automaticaly generated by module-init-tools
-# Use "dpkg-reconfigure module-init-tools" instead.
-EOF
- for i in network sound other ; do
- db_get module-init-tools/$i
- for j in `echo "$RET" | sed -e "s/, /|/g" | tr "|" "\n" | sed -e "s/ .*//g"` ; do
- echo "$j" >> /etc/modules.d/module-init-tools
- done
- done
- new="`get_modules`"
-
- # Unload modules that:
- # a) were listed to be loaded in the old list
- # b) are not listed to be loaded in the new list
- # c) are actualy loaded
- # d) are not acpi
- OLDIFS="$IFS"
- IFS=":"
- for i in ${old} ; do case :${new}: in
- *:$i:*|*:acpi:*)
- ;;
- *)
- if kldstat -n $i >/dev/null 2>/dev/null ; then
- echo "Unloading $i ..."
- if ! kldunload $i ; then
- # It could well be that the module is in use.
- echo "Warning: failed to unload stale module $i, you may want to try manualy."
- fi
- else
- echo "Not unloading $i (not loaded)"
- fi
- ;;
- esac ; done
- IFS="$OLDIFS"
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Deleted: trunk/freebsd-utils/debian/module-init-tools.templates
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.templates 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/module-init-tools.templates 2009-04-13 18:46:51 UTC (rev 2442)
@@ -1,31 +0,0 @@
-Template: module-init-tools/network
-Type: multiselect
-Choices: ${choices}
-_Description: Network card drivers:
- Select the appropiate driver for your network cards. You may select more than
- one driver, or none at all, depending on the number of cards you have.
- .
- Note: You most likely don't need any, since default kernels currently include
- builtin support for many NICs. You can always come back to this question later
- with "dpkg-reconfigure module-init-tools".
-
-Template: module-init-tools/sound
-Type: multiselect
-Choices: ${choices}
-_Description: Sound card drivers:
- Select the appropiate driver for your sound cards. You may select more than
- one driver, or none at all, depending on the number of cards you have.
- .
- Note: If you don't know, don't select any yet. Later, you can use the
- snd_probe command to find it out. You can always come back to this question
- with "dpkg-reconfigure module-init-tools".
-
-Template: module-init-tools/other
-Type: multiselect
-Choices: ${choices}
-_Description: Other modules:
- Below is a selection of modules that don't fall in either of the previous
- cathegories. Select those you find adequate.
- .
- Note: If you don't know, don't select any yet. You can always come back to
- this question with "dpkg-reconfigure module-init-tools".
Deleted: trunk/freebsd-utils/debian/net-tools.install
===================================================================
--- trunk/freebsd-utils/debian/net-tools.install 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/net-tools.install 2009-04-13 18:46:51 UTC (rev 2442)
@@ -1,5 +0,0 @@
-sbin/ifconfig/ifconfig /sbin
-sbin/route/route /lib/freebsd
-debian/scripts/sbin/route /sbin
-sbin/pfctl/pfctl /sbin
-usr.sbin/authpf/authpf /usr/sbin/
Deleted: trunk/freebsd-utils/debian/net-tools.manpages
===================================================================
--- trunk/freebsd-utils/debian/net-tools.manpages 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/net-tools.manpages 2009-04-13 18:46:51 UTC (rev 2442)
@@ -1,5 +0,0 @@
-sbin/ifconfig/ifconfig.8
-sbin/route/route.8
-contrib/pf/authpf/authpf.8
-contrib/pf/pfctl/pfctl.8
-contrib/pf/man/*.5
Deleted: trunk/freebsd-utils/debian/net-tools.postinst
===================================================================
--- trunk/freebsd-utils/debian/net-tools.postinst 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/net-tools.postinst 2009-04-13 18:46:51 UTC (rev 2442)
@@ -1,27 +0,0 @@
-#! /bin/sh
-set -e
-
-case "$1" in
- configure)
- if test -e /etc/network/options ; then
- echo "Removing obsolete (and Linux-specific) /etc/network/options ..."
- rm -f /etc/network/options
- fi
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-
Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules 2009-04-13 15:36:11 UTC (rev 2441)
+++ trunk/freebsd-utils/debian/rules 2009-04-13 18:46:51 UTC (rev 2442)
@@ -51,7 +51,7 @@
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
touch $@
-build-arch: freebsd-utils gbde geli kbdcontrol module-init-tools net-tools
+build-arch: freebsd-utils gbde geli kbdcontrol kldutils freebsd-net-tools
freebsd-utils: freebsd-utils-stamp
freebsd-utils-stamp: patch-stamp
@@ -97,16 +97,16 @@
debian/kbdcontrol.config
touch $@
-module-init-tools: module-init-tools-stamp
-module-init-tools-stamp: patch-stamp
+kldutils: kldutils-stamp
+kldutils: patch-stamp
$(PMAKE) -C sbin/kldconfig
$(PMAKE) -C sbin/kldload
$(PMAKE) -C sbin/kldstat
$(PMAKE) -C sbin/kldunload
touch $@
-net-tools: net-tools-stamp
-net-tools-stamp: patch-stamp
+freebsd-net-tools: freebsd-net-tools-stamp
+freebsd-net-tools-stamp: patch-stamp
$(PMAKE) -C sbin/ifconfig
$(PMAKE) -C sbin/pfctl
$(PMAKE) -C sbin/route
More information about the Glibc-bsd-commits
mailing list