diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2011-12-20 15:27:21 +0400 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2011-12-20 15:27:21 +0400 |
| commit | 969aa9ace806b6edeb28d244a977af4ac9032143 (patch) | |
| tree | 80b47ad9382403b7926356c3b78181659867097c | |
| parent | f95cc8208eeb4ddb9ead7ca19254d431be5089b7 (diff) | |
Never take the snapshots when listing FS
| -rw-r--r-- | src/poudriere.d/common.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/poudriere.d/common.sh b/src/poudriere.d/common.sh index 42172ac2..c881ff3b 100644 --- a/src/poudriere.d/common.sh +++ b/src/poudriere.d/common.sh @@ -27,7 +27,7 @@ sig_handler() { jail_exists() { [ $# -ne 1 ] && err 1 "Fail: wrong number of arguments" - zfs list -rH -o poudriere:type,poudriere:name | \ + zfs list -t filesystem -rH -o poudriere:type,poudriere:name | \ egrep -q "^rootfs[[:space:]]$1$" && return 0 return 1 } @@ -45,19 +45,19 @@ jail_runs() { jail_get_base() { [ $# -ne 1 ] && err 1 "Fail: wrong number of arguments" - zfs list -rH -o poudriere:type,poudriere:name,mountpoint | \ + zfs list -t filesystem -rH -o poudriere:type,poudriere:name,mountpoint | \ awk '/^rootfs[[:space:]]'$1'[[:space:]]/ { print $3 }' } jail_get_version() { [ $# -ne 1 ] && err 1 "Fail: wrong number of arguments" - zfs list -rH -o poudriere:type,poudriere:name,poudriere:version | \ + zfs list -t filesystem -rH -o poudriere:type,poudriere:name,poudriere:version | \ awk '/^rootfs[[:space:]]'$1'[[:space:]]/ { print $3 }' } jail_get_fs() { [ $# -ne 1 ] && err 1 "Fail: wrong number of arguments" - zfs list -rH -o poudriere:type,poudriere:name,name | \ + zfs list -t filesystem -rH -o poudriere:type,poudriere:name,name | \ awk '/^rootfs[[:space:]]'$1'[[:space:]]/ { print $3 }' } @@ -69,26 +69,26 @@ jail_get_zpool_version() { } jail_ls() { - zfs list -rH -o poudriere:type,poudriere:name | \ + zfs list -t filesystem -rH -o poudriere:type,poudriere:name | \ awk '/^rootfs/ { print $2 }' } port_exists() { [ $# -ne 1 ] && err 1 "Fail: wrong number of arguments" - zfs list -rH -o poudriere:type,poudriere:name,name | \ + zfs list -t filesystem -rH -o poudriere:type,poudriere:name,name | \ egrep -q "^ports[[:space:]]$1" && return 0 return 1 } port_get_base() { [ $# -ne 1 ] && err 1 "Fail: wrong number of arguments" - zfs list -rH -o poudriere:type,poudriere:name,mountpoint | \ + zfs list -t filesystem -rH -o poudriere:type,poudriere:name,mountpoint | \ awk '/^ports[[:space:]]'$1'/ { print $3 }' } port_get_fs() { [ $# -ne 1 ] && err 1 "Fail: wrong number of arguments" - zfs list -rH -o poudriere:type,poudriere:name,name | \ + zfs list -t filesystem -rH -o poudriere:type,poudriere:name,name | \ awk '/^ports[[:space:]]'$1'/ { print $3 }' } |