diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2017-05-09 14:42:40 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2017-05-09 14:42:40 +0000 |
| commit | ebf49a23977f1ec3131e21695f379ad98de816b7 (patch) | |
| tree | 07cb812f422305a03808063c2a0520f1d76250bc /lib | |
| parent | Releasing debian version 20170405-1. (diff) | |
| download | open-infrastructure-compute-tools-ebf49a23977f1ec3131e21695f379ad98de816b7.tar.xz open-infrastructure-compute-tools-ebf49a23977f1ec3131e21695f379ad98de816b7.zip | |
Merging upstream version 20170510.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/container/create | 1 | ||||
| -rwxr-xr-x | lib/container/list | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/container/create b/lib/container/create index b4fc5e9..1a6f4d5 100755 --- a/lib/container/create +++ b/lib/container/create @@ -209,6 +209,7 @@ sed -e "s|@CNT_AUTO@|${CNT_AUTO}|g" \ -e "s|@CNT_OVERLAY@|${CNT_OVERLAY}|g" \ -e "s|@NAME@|${NAME}|g" \ -e "s|@BIND@|${BIND}|g" \ + -e "s|@BIND_RO@|${BIND_RO}|g" \ -e "s|@BOOT@|yes|g" \ -e "s|@CAPABILITY@|${CAPABILITY}|g" \ -e "s|@DIRECTORY@|${MACHINES}/${NAME}|g" \ diff --git a/lib/container/list b/lib/container/list index 9608fd7..9bf61c4 100755 --- a/lib/container/list +++ b/lib/container/list @@ -320,7 +320,7 @@ esac if ls "${MACHINES}"/* > /dev/null 2>&1 then - CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 -type d -and -not -name '.container-tools' -and -not -name 'container-tools' -and -not -name 'lost+found' -and -not -name '.snap' -and -not -name '.snapshot' -printf '%P\n' | sort)" + CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 -type d -and -not -name 'lost+found' -printf '%P\n' | sort)" fi for CONTAINER in ${CONTAINERS} |