[Glibc-bsd-commits] r3558 - trunk/freebsd-utils/debian
Robert Millan
rmh at alioth.debian.org
Mon Jul 11 09:51:36 UTC 2011
Author: rmh
Date: 2011-07-11 09:51:35 +0000 (Mon, 11 Jul 2011)
New Revision: 3558
Added:
trunk/freebsd-utils/debian/freebsd-nfs-common.nfsiod.init
Removed:
trunk/freebsd-utils/debian/freebsd-nfs-client.install
trunk/freebsd-utils/debian/freebsd-nfs-client.manpages
trunk/freebsd-utils/debian/freebsd-nfs-client.nfsiod.init
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/freebsd-nfs-common.install
trunk/freebsd-utils/debian/freebsd-nfs-common.manpages
trunk/freebsd-utils/debian/freebsd-utils.install
trunk/freebsd-utils/debian/freebsd-utils.manpages
Log:
Enable NFS utilities. (Closes: #629543)
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2011-07-10 22:15:33 UTC (rev 3557)
+++ trunk/freebsd-utils/debian/changelog 2011-07-11 09:51:35 UTC (rev 3558)
@@ -1,3 +1,9 @@
+freebsd-utils (8.2+ds2-2) UNRELEASED; urgency=low
+
+ * Enable NFS utilities. (Closes: #629543)
+
+ -- Robert Millan <rmh at debian.org> Mon, 11 Jul 2011 11:49:42 +0200
+
freebsd-utils (8.2+ds2-1) unstable; urgency=low
* Add __FreeBSD_version to CFLAGS. This enables code in a few places
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2011-07-10 22:15:33 UTC (rev 3557)
+++ trunk/freebsd-utils/debian/control 2011-07-11 09:51:35 UTC (rev 3558)
@@ -120,37 +120,26 @@
.
This is a minimal package for use in debian-installer.
-#Package: freebsd-nfs-client
-#Section: net
-#Priority: standard
-#Architecture: kfreebsd-any
-#Depends: ${shlibs:Depends}, ${misc:Depends}
-#Recommends: freebsd-nfs-common
-#Replaces: freebsd-utils (<= 8.2+ds1-1)
-#Description: FreeBSD client utility needed for NFS on GNU/kFreeBSD
-# This package provides FreeBSD client utility needed for NFS on
-# Debian GNU/kFreeBSD.
+Package: freebsd-nfs-server
+Section: net
+Priority: optional
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, freebsd-nfs-common
+Provides: nfs-server, nfs-kernel-server
+Description: FreeBSD server utilities needed for NFS on GNU/kFreeBSD
+ This package provides FreeBSD utilities needed for NFS server on
+ Debian GNU/kFreeBSD.
-#Package: freebsd-nfs-server
-#Section: net
-#Priority: optional
-#Architecture: kfreebsd-any
-#Depends: ${shlibs:Depends}, ${misc:Depends}, freebsd-nfs-common
-#Provides: nfs-server, nfs-kernel-server
-#Description: FreeBSD server utilities needed for NFS on GNU/kFreeBSD
-# This package provides FreeBSD utilities needed for NFS server on
-# Debian GNU/kFreeBSD.
+Package: freebsd-nfs-common
+Section: net
+Priority: standard
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind
+Provides: nfs-common
+Description: NFS support files common to client and server
+ Use this package on any machine that uses NFS, either as client or
+ server.
-#Package: freebsd-nfs-common
-#Section: net
-#Priority: standard
-#Architecture: kfreebsd-any
-#Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind
-#Provides: nfs-common
-#Description: NFS support files common to client and server
-# Use this package on any machine that uses NFS, either as client or
-# server.
-
# FIXME:
# - add jail
# - add ppp (ppp, pppd)
Deleted: trunk/freebsd-utils/debian/freebsd-nfs-client.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-client.install 2011-07-10 22:15:33 UTC (rev 3557)
+++ trunk/freebsd-utils/debian/freebsd-nfs-client.install 2011-07-11 09:51:35 UTC (rev 3558)
@@ -1,2 +0,0 @@
-sbin/mount_nfs/mount_nfs /sbin
-sbin/nfsiod/nfsiod /sbin
Deleted: trunk/freebsd-utils/debian/freebsd-nfs-client.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-client.manpages 2011-07-10 22:15:33 UTC (rev 3557)
+++ trunk/freebsd-utils/debian/freebsd-nfs-client.manpages 2011-07-11 09:51:35 UTC (rev 3558)
@@ -1,2 +0,0 @@
-sbin/mount_nfs/mount_nfs.8
-sbin/nfsiod/nfsiod.8
Deleted: trunk/freebsd-utils/debian/freebsd-nfs-client.nfsiod.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-client.nfsiod.init 2011-07-10 22:15:33 UTC (rev 3557)
+++ trunk/freebsd-utils/debian/freebsd-nfs-client.nfsiod.init 2011-07-11 09:51:35 UTC (rev 3558)
@@ -1,127 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: nfsiod
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Should-Start: $syslog
-# Should-Stop: $syslog
-# Default-Start: 2 3 4 5 S
-# Default-Stop: 0 1 6
-# Short-Description: local NFS asynchronous I/O server
-### END INIT INFO
-
-PATH=/sbin:/bin
-DESC="local NFS asynchronous I/O server"
-NAME=nfsiod
-DAEMON=/sbin/nfsiod
-DAEMON_ARGS=""
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
- || return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
- $DAEMON_ARGS \
- || return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
- RETVAL="$?"
- [ "$RETVAL" = 2 ] && return 2
- # Wait for children to finish too if this is a daemon that forks
- # and if the daemon is only ever run from this initscript.
- # If the above conditions are not satisfied then add some other code
- # that waits for the process to drop all resources that could be
- # needed by services started subsequently. A last resort is to
- # sleep for some time.
- start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
- [ "$?" = 2 ] && return 2
- # Many daemons don't delete their pidfiles when they exit.
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC " "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
Modified: trunk/freebsd-utils/debian/freebsd-nfs-common.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-common.install 2011-07-10 22:15:33 UTC (rev 3557)
+++ trunk/freebsd-utils/debian/freebsd-nfs-common.install 2011-07-11 09:51:35 UTC (rev 3558)
@@ -1,2 +1,3 @@
usr.sbin/rpc.statd/rpc.statd /usr/sbin
usr.sbin/rpc.lockd/rpc.lockd /usr/sbin
+sbin/nfsiod/nfsiod /sbin
Modified: trunk/freebsd-utils/debian/freebsd-nfs-common.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-common.manpages 2011-07-10 22:15:33 UTC (rev 3557)
+++ trunk/freebsd-utils/debian/freebsd-nfs-common.manpages 2011-07-11 09:51:35 UTC (rev 3558)
@@ -1,2 +1,3 @@
usr.sbin/rpc.statd/rpc.statd.8
usr.sbin/rpc.lockd/rpc.lockd.8
+sbin/nfsiod/nfsiod.8
Copied: trunk/freebsd-utils/debian/freebsd-nfs-common.nfsiod.init (from rev 3548, trunk/freebsd-utils/debian/freebsd-nfs-client.nfsiod.init)
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-common.nfsiod.init (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-nfs-common.nfsiod.init 2011-07-11 09:51:35 UTC (rev 3558)
@@ -0,0 +1,127 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: nfsiod
+# Required-Start: $network $local_fs
+# Required-Stop: $network $local_fs
+# Should-Start: $syslog
+# Should-Stop: $syslog
+# Default-Start: 2 3 4 5 S
+# Default-Stop: 0 1 6
+# Short-Description: local NFS asynchronous I/O server
+### END INIT INFO
+
+PATH=/sbin:/bin
+DESC="local NFS asynchronous I/O server"
+NAME=nfsiod
+DAEMON=/sbin/nfsiod
+DAEMON_ARGS=""
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+ || return 1
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+ $DAEMON_ARGS \
+ || return 2
+ # Add code here, if necessary, that waits for the process to be ready
+ # to handle requests from services started subsequently which depend
+ # on this one. As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+ RETVAL="$?"
+ [ "$RETVAL" = 2 ] && return 2
+ # Wait for children to finish too if this is a daemon that forks
+ # and if the daemon is only ever run from this initscript.
+ # If the above conditions are not satisfied then add some other code
+ # that waits for the process to drop all resources that could be
+ # needed by services started subsequently. A last resort is to
+ # sleep for some time.
+ start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+ [ "$?" = 2 ] && return 2
+ # Many daemons don't delete their pidfiles when they exit.
+ rm -f $PIDFILE
+ return "$RETVAL"
+}
+
+case "$1" in
+ start)
+ log_daemon_msg "Starting $DESC " "$NAME"
+ do_start
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
+ esac
+ ;;
+ status)
+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+ ;;
+ restart|force-reload)
+ #
+ # If the "reload" option is implemented then remove the
+ # 'force-reload' alias
+ #
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+:
Modified: trunk/freebsd-utils/debian/freebsd-utils.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.install 2011-07-10 22:15:33 UTC (rev 3557)
+++ trunk/freebsd-utils/debian/freebsd-utils.install 2011-07-11 09:51:35 UTC (rev 3558)
@@ -27,6 +27,7 @@
sbin/mount_ext2fs/mount_ext2fs /sbin
sbin/mount_hpfs/mount_hpfs /sbin
sbin/mount_msdosfs/mount_msdosfs /sbin
+sbin/mount_nfs/mount_nfs /sbin
sbin/mount_ntfs/mount_ntfs /sbin
sbin/mount_nullfs/mount_nullfs /sbin
sbin/mount_reiserfs/mount_reiserfs /sbin
Modified: trunk/freebsd-utils/debian/freebsd-utils.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.manpages 2011-07-10 22:15:33 UTC (rev 3557)
+++ trunk/freebsd-utils/debian/freebsd-utils.manpages 2011-07-11 09:51:35 UTC (rev 3558)
@@ -17,6 +17,7 @@
sbin/mount_hpfs/mount_hpfs.8
sbin/mount/mount.8
sbin/mount_msdosfs/mount_msdosfs.8
+sbin/mount_nfs/mount_nfs.8
sbin/mount_ntfs/mount_ntfs.8
sbin/mount_nullfs/mount_nullfs.8
sbin/mount_reiserfs/mount_reiserfs.8
More information about the Glibc-bsd-commits
mailing list