diff --git a/scripts/zpool-config/file-raid0.sh b/scripts/zpool-config/file-raid0.sh index 5ec80b05c1ff..ff118361c2c9 100644 --- a/scripts/zpool-config/file-raid0.sh +++ b/scripts/zpool-config/file-raid0.sh @@ -3,10 +3,9 @@ # 4 File Raid-0 Configuration # -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \ + $FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} zpool_create() { for FILE in ${FILES}; do diff --git a/scripts/zpool-config/file-raid10.sh b/scripts/zpool-config/file-raid10.sh index ae7f0ae07bb9..fa297b424f3a 100644 --- a/scripts/zpool-config/file-raid10.sh +++ b/scripts/zpool-config/file-raid10.sh @@ -3,10 +3,9 @@ # 4 File Raid-10 Configuration # -FILES_M1="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1" -FILES_M2="/tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES_M1=${FILES_M1:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1"} +FILES_M2=${FILES_M2:-"$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} FILES="${FILES_M1} ${FILES_M2}" zpool_create() { diff --git a/scripts/zpool-config/file-raidz.sh b/scripts/zpool-config/file-raidz.sh index 5b6c3ea2c209..768e3de89e5e 100644 --- a/scripts/zpool-config/file-raidz.sh +++ b/scripts/zpool-config/file-raidz.sh @@ -3,10 +3,9 @@ # 4 File Raid-Z Configuration # -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \ + $FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} zpool_create() { for FILE in ${FILES}; do diff --git a/scripts/zpool-config/file-raidz2.sh b/scripts/zpool-config/file-raidz2.sh index bc0e5ec8afc6..b1c18f45780a 100644 --- a/scripts/zpool-config/file-raidz2.sh +++ b/scripts/zpool-config/file-raidz2.sh @@ -3,10 +3,9 @@ # 4 File Raid-Z2 Configuration # -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \ + $FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} zpool_create() { for FILE in ${FILES}; do diff --git a/scripts/zpool-config/lo-faulty-raid0.sh b/scripts/zpool-config/lo-faulty-raid0.sh index 10b8f88bc660..bf057bba1c34 100644 --- a/scripts/zpool-config/lo-faulty-raid0.sh +++ b/scripts/zpool-config/lo-faulty-raid0.sh @@ -9,10 +9,9 @@ # <--------------------- raid0 zpool ---------------------> # -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \ + $FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} LODEVICES="" MDDEVICES="" diff --git a/scripts/zpool-config/lo-faulty-raid10.sh b/scripts/zpool-config/lo-faulty-raid10.sh index ef81abb9dafd..0a3720ae1caa 100644 --- a/scripts/zpool-config/lo-faulty-raid10.sh +++ b/scripts/zpool-config/lo-faulty-raid10.sh @@ -9,10 +9,10 @@ # <--------------------- raid10 zpool ---------------------> # -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES_M1=${FILES_M1:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1"} +FILES_M2=${FILES_M2:-"$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} +FILES="${FILES_M1} ${FILES_M2}" LODEVICES="" MDDEVICES="" MDDEVICES_M1="" diff --git a/scripts/zpool-config/lo-faulty-raidz.sh b/scripts/zpool-config/lo-faulty-raidz.sh index 2f1f08aa65d2..07fd145593ba 100644 --- a/scripts/zpool-config/lo-faulty-raidz.sh +++ b/scripts/zpool-config/lo-faulty-raidz.sh @@ -9,10 +9,9 @@ # <--------------------- raidz zpool ---------------------> # -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \ + $FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} LODEVICES="" MDDEVICES="" diff --git a/scripts/zpool-config/lo-faulty-raidz2.sh b/scripts/zpool-config/lo-faulty-raidz2.sh index 2522fa7e7df4..4456a56e2f42 100644 --- a/scripts/zpool-config/lo-faulty-raidz2.sh +++ b/scripts/zpool-config/lo-faulty-raidz2.sh @@ -9,10 +9,9 @@ # <--------------------- raidz2 zpool --------------------> # -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \ + $FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} LODEVICES="" MDDEVICES="" diff --git a/scripts/zpool-config/lo-raid0.sh b/scripts/zpool-config/lo-raid0.sh index f24050f46531..1f23fe1ff8b7 100644 --- a/scripts/zpool-config/lo-raid0.sh +++ b/scripts/zpool-config/lo-raid0.sh @@ -3,10 +3,9 @@ # 4 Device Loopback Raid-0 Configuration # -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \ + $FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} DEVICES="" zpool_create() { diff --git a/scripts/zpool-config/lo-raid10.sh b/scripts/zpool-config/lo-raid10.sh index f9fe3c064689..18c1dcbfd8ac 100644 --- a/scripts/zpool-config/lo-raid10.sh +++ b/scripts/zpool-config/lo-raid10.sh @@ -3,10 +3,9 @@ # 4 Device Loopback Raid-0 Configuration # -FILES_M1="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1" -FILES_M2="/tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES_M1=${FILES_M1:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1"} +FILES_M2=${FILES_M2:-"$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} FILES="${FILES_M1} ${FILES_M2}" DEVICES_M1="" DEVICES_M2="" diff --git a/scripts/zpool-config/lo-raidz.sh b/scripts/zpool-config/lo-raidz.sh index db5de7c1bf21..483baf7b8995 100644 --- a/scripts/zpool-config/lo-raidz.sh +++ b/scripts/zpool-config/lo-raidz.sh @@ -2,11 +2,9 @@ # # 4 Device Loopback Raid-0 Configuration # - -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \ + $FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} DEVICES="" zpool_create() { diff --git a/scripts/zpool-config/lo-raidz2.sh b/scripts/zpool-config/lo-raidz2.sh index 53a032ec5f43..ea52236d339f 100644 --- a/scripts/zpool-config/lo-raidz2.sh +++ b/scripts/zpool-config/lo-raidz2.sh @@ -3,10 +3,9 @@ # 4 Device Loopback Raid-0 Configuration # -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2 \ - /tmp/zpool-vdev3" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \ + $FILEDIR/file-vdev2 $FILEDIR/file-vdev3"} DEVICES="" zpool_create() { diff --git a/scripts/zpool-config/scsi_debug-raid0.sh b/scripts/zpool-config/scsi_debug-raid0.sh index 797ea8019dbb..fc097981725e 100644 --- a/scripts/zpool-config/scsi_debug-raid0.sh +++ b/scripts/zpool-config/scsi_debug-raid0.sh @@ -9,9 +9,8 @@ SDHOSTS=${SDHOSTS:-1} SDTGTS=${SDTGTS:-1} SDLUNS=${SDLUNS:-1} LDMOD=/sbin/modprobe -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 $FILEDIR/file-vdev2"} DEVICES="" zpool_create() { diff --git a/scripts/zpool-config/scsi_debug-raid10.sh b/scripts/zpool-config/scsi_debug-raid10.sh index 4ec205b8b00e..3c1f733605d8 100644 --- a/scripts/zpool-config/scsi_debug-raid10.sh +++ b/scripts/zpool-config/scsi_debug-raid10.sh @@ -9,9 +9,8 @@ SDHOSTS=${SDHOSTS:-1} SDTGTS=${SDTGTS:-1} SDLUNS=${SDLUNS:-1} LDMOD=/sbin/modprobe -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 $FILEDIR/file-vdev2"} DEVICES_M1="" DEVICES_M2="" diff --git a/scripts/zpool-config/scsi_debug-raidz.sh b/scripts/zpool-config/scsi_debug-raidz.sh index c811a0182692..54a456524cd9 100644 --- a/scripts/zpool-config/scsi_debug-raidz.sh +++ b/scripts/zpool-config/scsi_debug-raidz.sh @@ -9,9 +9,8 @@ SDHOSTS=${SDHOSTS:-1} SDTGTS=${SDTGTS:-1} SDLUNS=${SDLUNS:-1} LDMOD=/sbin/modprobe -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 $FILEDIR/file-vdev2"} DEVICES="" zpool_create() { diff --git a/scripts/zpool-config/scsi_debug-raidz2.sh b/scripts/zpool-config/scsi_debug-raidz2.sh index 429a84143563..fa6e77a09cca 100644 --- a/scripts/zpool-config/scsi_debug-raidz2.sh +++ b/scripts/zpool-config/scsi_debug-raidz2.sh @@ -9,9 +9,8 @@ SDHOSTS=${SDHOSTS:-1} SDTGTS=${SDTGTS:-1} SDLUNS=${SDLUNS:-1} LDMOD=/sbin/modprobe -FILES="/tmp/zpool-vdev0 \ - /tmp/zpool-vdev1 \ - /tmp/zpool-vdev2" +FILEDIR=${FILEDIR:-/var/tmp} +FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 $FILEDIR/file-vdev2"} DEVICES="" zpool_create() {