Fix some minor issues with the SYSV init and initramfs scripts.

This is some minor fixes to commits 2cac7f5f11756663525a5d4604d9f0a3202d4024
and 2a34db1bdbcecf5019c4a59f2a44c92fe82010f2.

* Make sure to alien'ate the new initramfs rpm package as well!
  The rpm package is build correctly, but alien isn't run on it to
  create the deb.
* Before copying file from COPY_FILE_LIST, make sure the DESTDIR/dir exists.
* Include /lib/udev/vdev_id file in the initrd.
* Because the initrd needs to use '/sbin/modprobe' instead of 'modprobe',
  we need to use this in load_module() as well.
  * Make sure that load_module() can be used more globaly, instead of
    calling '/sbin/modprobe' all over the place.
  * Make sure that check_module_loaded() have a parameter - module to
    check.

Signed-off-by: Turbo Fredriksson <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3626

1 files changed, 3 insertions, 3 deletions

diff --git a/etc/init.d/zfs-import.in b/etc/init.d/zfs-import.in
index fed364a60..b02d8a92c 100755
--- a/etc/init.d/zfs-import.in
+++ b/etc/init.d/zfs-import.in
@@ -277,7 +277,7 @@ do_export()
 # Output the status and list of pools
 do_status()
 {
-	check_module_loaded || exit 0
+	check_module_loaded "zfs" || exit 0
 
 	"$ZPOOL" status && echo "" && "$ZPOOL" list
 }
@@ -298,7 +298,7 @@ do_start()
 		    zfs_log_begin_msg "Loading kernel ZFS infrastructure"
 		fi
 
-		if ! load_module
+		if ! load_module "zfs"
 		then
 			[ "$VERBOSE_MOUNT" = 'yes' ] && zfs_log_end_msg 1
 			return 5
@@ -316,7 +316,7 @@ do_start()
 do_stop()
 {
 	# Check to see if the module is even loaded.
-	check_module_loaded || exit 0
+	check_module_loaded "zfs" || exit 0
 
 	do_export
 }