Import from zfs-utils-common-git

1 files changed, 12 insertions, 12 deletions

diff --git a/zfs-utils.initcpio.install b/zfs-utils.initcpio.install
index c128d1006371..8b646a101a04 100644
--- a/zfs-utils.initcpio.install
+++ b/zfs-utils.initcpio.install
@@ -7,34 +7,31 @@ build() {
         zunicode \
         zcommon \
         zfs \
-        zpios \
-        spl \
-        splat \
-        zlib_deflate
+        spl
 
     map add_binary \
         arcstat.py \
         dbufstat.py \
         fsck.zfs \
         mount.zfs \
+        seq \
         zdb \
         zed \
         zfs \
         zhack \
         zinject \
-        zpios \
         zpool \
         zstreamdump \
         ztest \
-        splat \
-        hostid \
         /lib/udev/vdev_id \
-        /lib/udev/zvol_id
+        /lib/udev/zvol_id \
+        findmnt
 
     map add_file \
         /lib/udev/rules.d/60-zvol.rules \
         /lib/udev/rules.d/69-vdev.rules \
-        /lib/udev/rules.d/90-zfs.rules
+        /lib/udev/rules.d/90-zfs.rules \
+        /lib/libgcc_s.so.1
 
     map add_dir \
         /etc/zfs/zed.d
@@ -42,11 +39,10 @@ build() {
     add_runscript
 
     # allow mount(8) to "autodetect" ZFS
-    echo 'zfs' >>"$BUILDROOT/etc/filesystems"
+    echo 'zfs' >>"${BUILDROOT}/etc/filesystems"
 
-    [[ -f /etc/zfs/zpool.cache ]] && add_file "/etc/zfs/zpool.cache"
+    [[ -f /etc/zfs/zpool.cache ]] && cp "/etc/zfs/zpool.cache" "${BUILDROOT}/etc/zfs/zpool.cache.org"
     [[ -f /etc/modprobe.d/zfs.conf ]] && add_file "/etc/modprobe.d/zfs.conf"
-    [[ -f /etc/hostid ]] && add_file "/etc/hostid"
 }
 
 help() {
@@ -73,6 +69,10 @@ Command Line Setup:
         If set to 1, this will use "zpool import -f" when attempting to import
         pools.
 
+    To change the seconds of time to wait for ZFS devices to show up at boot:
+
+        zfs_wait=30
+
     To search for devices in a directory other than "/dev":
 
         zfs_import_dir=/dev/disk/by-uuid