Skip to content

Commit 99d3ece

Browse files
behlendorfbehlendorf
committed
Add default FILEDIR path to zpool-config scripts
Allow the caller of the zpool-create.sh script to override the default path where file vdevs are created. This allows for greated flexibilty when scripting. Additionally, update the default path from /tmp/ to /var/tmp/ because these days /tmp/ is likely a ramdisk. Even though these files are sparse they may grow large in which case they should be backed by a physical device. Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Tim Chase <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #2120
1 parent f12971e commit 99d3ece

16 files changed

+45
-61
lines changed

‎scripts/zpool-config/file-raid0.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
# 4 File Raid-0 Configuration
44
#
55

6-
FILES="/tmp/zpool-vdev0 \
7-
/tmp/zpool-vdev1 \
8-
/tmp/zpool-vdev2 \
9-
/tmp/zpool-vdev3"
6+
FILEDIR=${FILEDIR:-/var/tmp}
7+
FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \
8+
$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"}
109

1110
zpool_create() {
1211
for FILE in ${FILES}; do

‎scripts/zpool-config/file-raid10.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
# 4 File Raid-10 Configuration
44
#
55

6-
FILES_M1="/tmp/zpool-vdev0 \
7-
/tmp/zpool-vdev1"
8-
FILES_M2="/tmp/zpool-vdev2 \
9-
/tmp/zpool-vdev3"
6+
FILEDIR=${FILEDIR:-/var/tmp}
7+
FILES_M1=${FILES_M1:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1"}
8+
FILES_M2=${FILES_M2:-"$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"}
109
FILES="${FILES_M1} ${FILES_M2}"
1110

1211
zpool_create() {

‎scripts/zpool-config/file-raidz.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
# 4 File Raid-Z Configuration
44
#
55

6-
FILES="/tmp/zpool-vdev0 \
7-
/tmp/zpool-vdev1 \
8-
/tmp/zpool-vdev2 \
9-
/tmp/zpool-vdev3"
6+
FILEDIR=${FILEDIR:-/var/tmp}
7+
FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \
8+
$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"}
109

1110
zpool_create() {
1211
for FILE in ${FILES}; do

‎scripts/zpool-config/file-raidz2.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
# 4 File Raid-Z2 Configuration
44
#
55

6-
FILES="/tmp/zpool-vdev0 \
7-
/tmp/zpool-vdev1 \
8-
/tmp/zpool-vdev2 \
9-
/tmp/zpool-vdev3"
6+
FILEDIR=${FILEDIR:-/var/tmp}
7+
FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \
8+
$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"}
109

1110
zpool_create() {
1211
for FILE in ${FILES}; do

‎scripts/zpool-config/lo-faulty-raid0.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
# <--------------------- raid0 zpool --------------------->
1010
#
1111

12-
FILES="/tmp/zpool-vdev0 \
13-
/tmp/zpool-vdev1 \
14-
/tmp/zpool-vdev2 \
15-
/tmp/zpool-vdev3"
12+
FILEDIR=${FILEDIR:-/var/tmp}
13+
FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \
14+
$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"}
1615
LODEVICES=""
1716
MDDEVICES=""
1817

‎scripts/zpool-config/lo-faulty-raid10.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
# <--------------------- raid10 zpool --------------------->
1010
#
1111

12-
FILES="/tmp/zpool-vdev0 \
13-
/tmp/zpool-vdev1 \
14-
/tmp/zpool-vdev2 \
15-
/tmp/zpool-vdev3"
12+
FILEDIR=${FILEDIR:-/var/tmp}
13+
FILES_M1=${FILES_M1:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1"}
14+
FILES_M2=${FILES_M2:-"$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"}
15+
FILES="${FILES_M1} ${FILES_M2}"
1616
LODEVICES=""
1717
MDDEVICES=""
1818
MDDEVICES_M1=""

‎scripts/zpool-config/lo-faulty-raidz.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
# <--------------------- raidz zpool --------------------->
1010
#
1111

12-
FILES="/tmp/zpool-vdev0 \
13-
/tmp/zpool-vdev1 \
14-
/tmp/zpool-vdev2 \
15-
/tmp/zpool-vdev3"
12+
FILEDIR=${FILEDIR:-/var/tmp}
13+
FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \
14+
$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"}
1615
LODEVICES=""
1716
MDDEVICES=""
1817

‎scripts/zpool-config/lo-faulty-raidz2.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
# <--------------------- raidz2 zpool -------------------->
1010
#
1111

12-
FILES="/tmp/zpool-vdev0 \
13-
/tmp/zpool-vdev1 \
14-
/tmp/zpool-vdev2 \
15-
/tmp/zpool-vdev3"
12+
FILEDIR=${FILEDIR:-/var/tmp}
13+
FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \
14+
$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"}
1615
LODEVICES=""
1716
MDDEVICES=""
1817

‎scripts/zpool-config/lo-raid0.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
# 4 Device Loopback Raid-0 Configuration
44
#
55

6-
FILES="/tmp/zpool-vdev0 \
7-
/tmp/zpool-vdev1 \
8-
/tmp/zpool-vdev2 \
9-
/tmp/zpool-vdev3"
6+
FILEDIR=${FILEDIR:-/var/tmp}
7+
FILES=${FILES:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1 \
8+
$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"}
109
DEVICES=""
1110

1211
zpool_create() {

‎scripts/zpool-config/lo-raid10.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
# 4 Device Loopback Raid-0 Configuration
44
#
55

6-
FILES_M1="/tmp/zpool-vdev0 \
7-
/tmp/zpool-vdev1"
8-
FILES_M2="/tmp/zpool-vdev2 \
9-
/tmp/zpool-vdev3"
6+
FILEDIR=${FILEDIR:-/var/tmp}
7+
FILES_M1=${FILES_M1:-"$FILEDIR/file-vdev0 $FILEDIR/file-vdev1"}
8+
FILES_M2=${FILES_M2:-"$FILEDIR/file-vdev2 $FILEDIR/file-vdev3"}
109
FILES="${FILES_M1} ${FILES_M2}"
1110
DEVICES_M1=""
1211
DEVICES_M2=""

0 commit comments

Comments
 (0)