diff options
| author |   Fabio Erculiani <lxnay@sabayon.org> | 2012-11-11 10:13:03 +0100 |
|---|---|---|
| committer |   Richard Yao <ryao@cs.stonybrook.edu> | 2012-11-11 12:01:28 -0500 |
| commit | 30c7284c92cacf47250541172dddb10abd70a7a0 (patch) | |
| tree | a9dedbbf483c6da24b174086b4cc92b008b495ef | |
| parent | Make missing ZFS config file failures into warnings, bug #438200 (diff) | |
| download | genkernel-30c7284c92cacf47250541172dddb10abd70a7a0.tar.gz genkernel-30c7284c92cacf47250541172dddb10abd70a7a0.tar.bz2 genkernel-30c7284c92cacf47250541172dddb10abd70a7a0.zip | |
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>
| -rwxr-xr-x | defaults/initrd.scripts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 7cb41b3..2e8e744 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -707,7 +707,7 @@ startVolumes() { then good_msg "Importing ZFS pools" - /sbin/zpool import -N -a "${ZPOOL_FORCE}" + /sbin/zpool import -N -a ${ZPOOL_FORCE} if [ "$?" = '0' ] then @@ -725,12 +725,12 @@ startVolumes() { then good_msg "LUKS detected. Reimporting ${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 else 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' ] then |