Skip to content

Commit

Permalink
OS-4654 Backout OS-4524, it causes spurious svc:system/filesystem/sma…
Browse files Browse the repository at this point in the history
…rtdc failures

Revert "OS-4524: svc:/system/filesystem/smartdc should fail if zpool import fails"
This reverts commit 2e6fe72.
  • Loading branch information
trentm committed Aug 18, 2015
1 parent 171325b commit 3204851
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion overlay/generic/lib/svc/method/fs-joyent
Expand Up @@ -92,7 +92,7 @@ if [ $? -ne 0 ]; then
fi

for pool in $pools; do
zpool import -f $pool || fatal "failed to import $pool pool"
zpool import -f $pool
# Due to early, failed attempts to support the filesystem_limits
# feature we now need to ensure the dependent feature is enabled.
zpool set feature@extensible_dataset=enabled $pool
Expand Down

0 comments on commit 3204851

Please sign in to comment.