Rename the zfs package to zfsutils.

This change reflects the Debian kFreeBSD packaging.

diff --git a/debian/control b/debian/control
index 0599573b06ef22777c298db28c8b8822c12562a3..2e1f63741fa857c27bd75b13e4aa45f8a46c5826 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Architecture: any
 Depends: ${misc:Depends}
 Description: Native ZFS filesystem libraries for Linux
 
-Package: zfs
+Package: zfsutils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: zfs-dkms

diff --git a/debian/zfs.docs b/debian/zfs.docs
deleted file mode 100644 (file)
index a9ef2a5..0000000
--- a/debian/zfs.docs
+++ /dev/null
@@ -1,5 +0,0 @@
-README.markdown
-META
-COPYING
-OPENSOLARIS.LICENSE
-COPYRIGHT

diff --git a/debian/zfs.examples b/debian/zfs.examples
deleted file mode 100644 (file)
index 3123aac..0000000
--- a/debian/zfs.examples
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/zfs/zdev.conf.x4550.example
-etc/zfs/zdev.conf.supermicro.example
-etc/zfs/zdev.conf.dragon.example

diff --git a/debian/zfs.install b/debian/zfs.install
deleted file mode 100644 (file)
index 879cca6..0000000
--- a/debian/zfs.install
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/udev
-etc/zfs/zdev.conf
-usr/bin
-usr/libexec
-usr/sbin
-usr/share
-sbin

diff --git a/debian/zfs.zfsload.default b/debian/zfs.zfsload.default
deleted file mode 100644 (file)
index 215836d..0000000
--- a/debian/zfs.zfsload.default
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically run `zfs mount -a` at system startup if set non-empty.
-ZFS_MOUNT=''
-
-# Automatically run `zfs unmount -a` at system shutdown if set non-empty.
-ZFS_UNMOUNT=''

diff --git a/debian/zfs.zfsload.init b/debian/zfs.zfsload.init
deleted file mode 100644 (file)
index bc9fe3d..0000000
--- a/debian/zfs.zfsload.init
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/sh
-
-# description:loads all modules required for zfs
-### BEGIN INIT INFO
-# Provides:          zfsload
-# Required-Start:    $local_fs 
-# Required-Stop:     $local_fs 
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start daemon at boot time 
-# Description:       Enable service provided by zfs.
-### END INIT INFO
-
-
-# Source function library.
-
-. /lib/lsb/init-functions
-
-[ -r /etc/default/zfsload ] && . /etc/default/zfsload
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/
-RETVAL=0
-exec=/usr/sbin/zfsload
-prog=zfsload
-config=/etc/zfsload/zfsload.conf
-lockfile=/var/lock/subsys/$prog
-
-RES_COL=60
-# Command to move out to the configured column number
-MOVE_TO_COL="echo -n \\033[${RES_COL}G"
-# Command to set the color to SUCCESS (Green)
-SETCOLOR_SUCCESS="echo -n \\033[1;32m"
-# Command to set the color to FAILED (Red)
-SETCOLOR_FAILURE="echo -n \\033[1;31m"
-# Command to set the color back to normal
-SETCOLOR_NORMAL="echo -n \\033[0;39m"
-
-# Function to print the SUCCESS status
-echo_success() {
-        $MOVE_TO_COL
-        echo -n "["
-        $SETCOLOR_SUCCESS
-        echo -n "  OK  "
-        $SETCOLOR_NORMAL
-        echo -n "]"
-        echo -n "\r"
-        return 0
-}
-
-# Function to print the FAILED status message
-echo_failure() {
-
-        $MOVE_TO_COL
-        echo -n "["
-        $SETCOLOR_FAILURE
-        echo -n "FAILED"
-        $SETCOLOR_NORMAL
-        echo -n "]"
-        echo -n "\r"
-        return 1
-}
-
-start () {
-        modprobe zfs
-        zfs mount -a
-       
-       RETVAL=$?
-        if [ $RETVAL -eq 0 ]
-        then
-                echo -n "loading zfs modules "
-                echo_success
-        else
-                echo -n "failed load zfs modules"
-                echo_failure
-        fi
-        echo
-       return $RETVAL
-}
-
-stop () {
-       zfs umount -a
-       modprobe -r zfs
-       modprobe -r zcommon
-       modprobe -r zunicode
-       modprobe -r znvpair
-       modprobe -r zavl
-       modprobe -r spl
-
-       RETVAL=$?
-       if [ $RETVAL -eq 0 ]
-        then
-                echo -n "unloading zfs modules "
-                echo_success
-        else
-                echo -n "failed to unload zfs modules"
-                echo_failure
-        fi
-        echo
-        [ $RETVAL = 0 ] && rm -f $lockfile
-        return 0
-}
-
-restart() {
-        stop
-        start
-}
-
-case $1 in
-        start)
-               [ -z "$ZFS_MOUNT" ] && exit 0
-                start
-        ;;
-        stop)
-               [ -z "$ZFS_UNMOUNT" ] && exit 0
-                stop
-        ;;
-        restart)
-                restart
-        ;;
-        condrestart|try-restart)
-                [ -f $lockfile ] && restart || :
-        ;;
-        reload)
-                echo -n $"Reloading $prog: "
-                killproc $prog -HUP
-                RETVAL=$?
-                echo
-        ;;
-        force-reload)
-                echo -n $"Reloading $prog: "
-                if ! killproc $prog -HUP; then
-                        restart
-                fi
-                echo
-        ;;
-       status)
-               status=`lsmod | grep zfs | cut -d ' ' -f1 | head -n 1 2>  /dev/null`
-                if [ "$status" = "zfs" ]
-                then
-                        echo "* zfs service is running"
-                else
-                        echo "* zfs service is stopped"
-                fi
-        ;;
-        restartlog)
-                stop
-                cat /dev/null >/var/log/zfsload/error_log
-                start
-        ;;
-        *)
-
-        echo $"Usage: $prog {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
-        exit 2
-esac
-
-exit $RETVAL

diff --git a/debian/zfsutils.docs b/debian/zfsutils.docs
new file mode 100644 (file)
index 0000000..a9ef2a5
--- /dev/null
+++ b/debian/zfsutils.docs
@@ -0,0 +1,5 @@
+README.markdown
+META
+COPYING
+OPENSOLARIS.LICENSE
+COPYRIGHT

diff --git a/debian/zfsutils.examples b/debian/zfsutils.examples
new file mode 100644 (file)
index 0000000..3123aac
--- /dev/null
+++ b/debian/zfsutils.examples
@@ -0,0 +1,3 @@
+etc/zfs/zdev.conf.x4550.example
+etc/zfs/zdev.conf.supermicro.example
+etc/zfs/zdev.conf.dragon.example

diff --git a/debian/zfsutils.install b/debian/zfsutils.install
new file mode 100644 (file)
index 0000000..879cca6
--- /dev/null
+++ b/debian/zfsutils.install
@@ -0,0 +1,7 @@
+etc/udev
+etc/zfs/zdev.conf
+usr/bin
+usr/libexec
+usr/sbin
+usr/share
+sbin

diff --git a/debian/zfsutils.zfsload.default b/debian/zfsutils.zfsload.default
new file mode 100644 (file)
index 0000000..215836d
--- /dev/null
+++ b/debian/zfsutils.zfsload.default
@@ -0,0 +1,5 @@
+# Automatically run `zfs mount -a` at system startup if set non-empty.
+ZFS_MOUNT=''
+
+# Automatically run `zfs unmount -a` at system shutdown if set non-empty.
+ZFS_UNMOUNT=''

diff --git a/debian/zfsutils.zfsload.init b/debian/zfsutils.zfsload.init
new file mode 100644 (file)
index 0000000..bc9fe3d
--- /dev/null
+++ b/debian/zfsutils.zfsload.init
@@ -0,0 +1,156 @@
+#!/bin/sh
+
+# description:loads all modules required for zfs
+### BEGIN INIT INFO
+# Provides:          zfsload
+# Required-Start:    $local_fs 
+# Required-Stop:     $local_fs 
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start daemon at boot time 
+# Description:       Enable service provided by zfs.
+### END INIT INFO
+
+
+# Source function library.
+
+. /lib/lsb/init-functions
+
+[ -r /etc/default/zfsload ] && . /etc/default/zfsload
+
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/
+RETVAL=0
+exec=/usr/sbin/zfsload
+prog=zfsload
+config=/etc/zfsload/zfsload.conf
+lockfile=/var/lock/subsys/$prog
+
+RES_COL=60
+# Command to move out to the configured column number
+MOVE_TO_COL="echo -n \\033[${RES_COL}G"
+# Command to set the color to SUCCESS (Green)
+SETCOLOR_SUCCESS="echo -n \\033[1;32m"
+# Command to set the color to FAILED (Red)
+SETCOLOR_FAILURE="echo -n \\033[1;31m"
+# Command to set the color back to normal
+SETCOLOR_NORMAL="echo -n \\033[0;39m"
+
+# Function to print the SUCCESS status
+echo_success() {
+        $MOVE_TO_COL
+        echo -n "["
+        $SETCOLOR_SUCCESS
+        echo -n "  OK  "
+        $SETCOLOR_NORMAL
+        echo -n "]"
+        echo -n "\r"
+        return 0
+}
+
+# Function to print the FAILED status message
+echo_failure() {
+
+        $MOVE_TO_COL
+        echo -n "["
+        $SETCOLOR_FAILURE
+        echo -n "FAILED"
+        $SETCOLOR_NORMAL
+        echo -n "]"
+        echo -n "\r"
+        return 1
+}
+
+start () {
+        modprobe zfs
+        zfs mount -a
+       
+       RETVAL=$?
+        if [ $RETVAL -eq 0 ]
+        then
+                echo -n "loading zfs modules "
+                echo_success
+        else
+                echo -n "failed load zfs modules"
+                echo_failure
+        fi
+        echo
+       return $RETVAL
+}
+
+stop () {
+       zfs umount -a
+       modprobe -r zfs
+       modprobe -r zcommon
+       modprobe -r zunicode
+       modprobe -r znvpair
+       modprobe -r zavl
+       modprobe -r spl
+
+       RETVAL=$?
+       if [ $RETVAL -eq 0 ]
+        then
+                echo -n "unloading zfs modules "
+                echo_success
+        else
+                echo -n "failed to unload zfs modules"
+                echo_failure
+        fi
+        echo
+        [ $RETVAL = 0 ] && rm -f $lockfile
+        return 0
+}
+
+restart() {
+        stop
+        start
+}
+
+case $1 in
+        start)
+               [ -z "$ZFS_MOUNT" ] && exit 0
+                start
+        ;;
+        stop)
+               [ -z "$ZFS_UNMOUNT" ] && exit 0
+                stop
+        ;;
+        restart)
+                restart
+        ;;
+        condrestart|try-restart)
+                [ -f $lockfile ] && restart || :
+        ;;
+        reload)
+                echo -n $"Reloading $prog: "
+                killproc $prog -HUP
+                RETVAL=$?
+                echo
+        ;;
+        force-reload)
+                echo -n $"Reloading $prog: "
+                if ! killproc $prog -HUP; then
+                        restart
+                fi
+                echo
+        ;;
+       status)
+               status=`lsmod | grep zfs | cut -d ' ' -f1 | head -n 1 2>  /dev/null`
+                if [ "$status" = "zfs" ]
+                then
+                        echo "* zfs service is running"
+                else
+                        echo "* zfs service is stopped"
+                fi
+        ;;
+        restartlog)
+                stop
+                cat /dev/null >/var/log/zfsload/error_log
+                start
+        ;;
+        *)
+
+        echo $"Usage: $prog {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
+        exit 2
+esac
+
+exit $RETVAL