bugfix: install * failure if directory found

[zfsinstaller.git] / zfsinstall.sh

diff --git a/zfsinstall.sh b/zfsinstall.sh
index f9dae727280517ba3179ffcdd906c16a57205736..c68d60af06481357b930abbec3bf679dfc88ba93 100644 (file)
--- a/zfsinstall.sh
+++ b/zfsinstall.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DESTDISK="ada0 ada1"
+DESTDISKS="ada0 ada1"
 DESTDIR="/mnt/zfs"
 ZPOOL="zroot"
 
@@ -138,7 +138,11 @@ COPYCAT="/etc/rc.conf.d"
 cd ${SCRIPTBASE}${COPYCAT} || exit 1
 install -o root -g wheel -d -m 0755 ${DESTDIR}${COPYCAT} || exit 1
 echo installing files into ${COPYCAT}
-install  -o root -g wheel -m 0644 * ${DESTDIR}${COPYCAT}/
+for I in *; do
+       if [ -r "${I}" -a -f ${I} ]; then
+               install  -o root -g wheel -m 0644 ${I} ${DESTDIR}${COPYCAT}/
+       fi
+done
 COPYCAT="/etc/rc.conf.d/network"
 cd ${SCRIPTBASE}${COPYCAT} || exit 1
 install -o root -g wheel -d -m 0755 ${DESTDIR}${COPYCAT} || exit 1