Unquote ${ZPOOL_FORCE} variable usage.

The default value of ${ZPOOL_USAGE} is unset, quoting it would result into
a "" argument passed to zpool. The workaround to this is to use "dozfs=force"
boot argument.

Signed-off-by: Richard Yao <ryao@gentoo.org>
cleanup-cruft
Fabio Erculiani 12 years ago committed by Richard Yao
parent e4af35fdfc
commit 30c7284c92

@ -707,7 +707,7 @@ startVolumes() {
then then
good_msg "Importing ZFS pools" good_msg "Importing ZFS pools"
/sbin/zpool import -N -a "${ZPOOL_FORCE}" /sbin/zpool import -N -a ${ZPOOL_FORCE}
if [ "$?" = '0' ] if [ "$?" = '0' ]
then then
@ -725,12 +725,12 @@ startVolumes() {
then then
good_msg "LUKS detected. Reimporting ${ZFS_POOL}" good_msg "LUKS detected. Reimporting ${ZFS_POOL}"
/sbin/zpool export -f "${ZFS_POOL}" /sbin/zpool export -f "${ZFS_POOL}"
/sbin/zpool import -N "${ZPOOL_FORCE}" "${ZFS_POOL}" /sbin/zpool import -N ${ZPOOL_FORCE} "${ZFS_POOL}"
fi fi
else else
good_msg "Importing ZFS pool ${ZFS_POOL}" good_msg "Importing ZFS pool ${ZFS_POOL}"
/sbin/zpool import -N "${ZPOOL_FORCE}" "${ZFS_POOL}" /sbin/zpool import -N ${ZPOOL_FORCE} "${ZFS_POOL}"
if [ "$?" = '0' ] if [ "$?" = '0' ]
then then

Loading…
Cancel
Save