diff options
| author | Turbo Fredriksson <[email protected]> | 2015-07-24 12:49:03 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-07-24 15:05:33 -0700 |
| commit | 48511ea6454224bc96ac518501a89ba52d7a5102 (patch) | |
| tree | bfdd2163d89ef023b23c05a4ae14b1386de63ded /contrib | |
| parent | 96c080cb9c2c1c4e669bdc6930128bc676bc5552 (diff) | |
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
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/initramfs/hooks/zfs | 4 | ||||
| -rw-r--r-- | contrib/initramfs/scripts/zfs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/initramfs/hooks/zfs b/contrib/initramfs/hooks/zfs index c4f4332cb..53e876d33 100755 --- a/contrib/initramfs/hooks/zfs +++ b/contrib/initramfs/hooks/zfs @@ -9,7 +9,7 @@ PREREQ="zdev" # These prerequisites are provided by the zfsutils package. The zdb utility is # not strictly required, but it can be useful at the initramfs recovery prompt. COPY_EXEC_LIST="/sbin/zdb /sbin/zpool /sbin/zfs /sbin/mount.zfs" -COPY_EXEC_LIST="$COPY_EXEC_LIST /usr/bin/dirname" +COPY_EXEC_LIST="$COPY_EXEC_LIST /usr/bin/dirname /lib/udev/vdev_id" COPY_FILE_LIST="/etc/hostid /etc/zfs/zpool.cache /etc/default/zfs" COPY_FILE_LIST="$COPY_FILE_LIST /etc/zfs/zfs-functions /etc/zfs/vdev_id.conf" COPY_FILE_LIST="$COPY_FILE_LIST /lib/udev/rules.d/69-vdev.rules" @@ -65,7 +65,7 @@ done for ii in $COPY_FILE_LIST do dir=$(dirname "$ii") - [ -d "$dir" ] || mkdir -p "$dir" + [ -d "$dir" ] && mkdir -p "$DESTDIR/$dir" [ -f "$ii" ] && cp -p "$ii" "$DESTDIR/$ii" done diff --git a/contrib/initramfs/scripts/zfs b/contrib/initramfs/scripts/zfs index 43107c4dc..dc01db11e 100644 --- a/contrib/initramfs/scripts/zfs +++ b/contrib/initramfs/scripts/zfs @@ -282,7 +282,7 @@ load_module_initrd() [ ! -f /etc/mtab ] && cat /proc/mounts > /etc/mtab # Load the module - load_module || return 1 + load_module "zfs" || return 1 if [ "$ZFS_INITRD_POST_MODPROBE_SLEEP" > 0 ] then @@ -388,7 +388,7 @@ decrypt_fs() do [ "$quiet" != "y" ] && zfs_log_progress_msg "${mod} " - ZFS_CMD="/sbin/modprobe $mod" + ZFS_CMD="load_module $mod" ZFS_STDERR="$(${ZFS_CMD} 2>&1)" ZFS_ERROR="$?" |