Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-01-16 13:29:22 -08:00
parent 8fc9b7596f e84cc2313f
commit 2891bdeede
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/common.sh
View File

@ -5,10 +5,15 @@
# a full ZFS init script when that is needed. # a full ZFS init script when that is needed.
# #
if [ ! -f ../.script-config ]; then
echo "You must build your source tree"
exit 1
fi
. ../.script-config . ../.script-config
PROG="<define PROG>" PROG="<define PROG>"
VERBOSE= VERBOSE=
VERBOSE_FLAG=
DUMP_LOG= DUMP_LOG=
ERROR= ERROR=
MODULES=() MODULES=()

21
scripts/zpios.sh
View File

@ -108,8 +108,9 @@ check_test() {
} }
PROFILE= PROFILE=
ZPOOL_CONFIG="zpool-config.cfg" ZPOOL_CONFIG=zpool-config.cfg
ZPIOS_TEST="zpios-test.cfg" ZPIOS_TEST=zpios-test.cfg
ZPOOL_NAME=zpios
while getopts 'hvpc:t:' OPTION; do while getopts 'hvpc:t:' OPTION; do
case $OPTION in case $OPTION in
@ -119,6 +120,7 @@ while getopts 'hvpc:t:' OPTION; do
;; ;;
v) v)
VERBOSE=1 VERBOSE=1
VERBOSE_FLAG="-v"
;; ;;
p) p)
PROFILE=1 PROFILE=1
@ -151,6 +153,11 @@ if check_modules; then
fi fi
fi fi
msg "Waiting for /dev/zpios to come up..."
while [ ! -c /dev/zpios ]; do
sleep 1
done
if [ ${VERBOSE} ]; then if [ ${VERBOSE} ]; then
print_header print_header
print_spl_info print_spl_info
@ -158,15 +165,7 @@ if [ ${VERBOSE} ]; then
fi fi
# Create the zpool configuration # Create the zpool configuration
./zpool-create.sh -c ${ZPOOL_CONFIG} || exit 1 ./zpool-create.sh ${VERBOSE_FLAG} -p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} || exit 1
msg "${CMDDIR}/zpool/zpool status zpios"
${CMDDIR}/zpool/zpool status zpios || exit 1
msg "Waiting for /dev/zpios to come up..."
while [ ! -c /dev/zpios ]; do
sleep 1
done
if [ -n "${ZPIOS_PRE}" ]; then if [ -n "${ZPIOS_PRE}" ]; then
msg "Executing ${ZPIOS_PRE}" msg "Executing ${ZPIOS_PRE}"