diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-08-30 13:04:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-08-30 13:05:23 +0000 |
| commit | 4eb8ddfe43f70976d7934a108527124d080b3f4e (patch) | |
| tree | d2b599d5b03e4a343bacf7565ae035a099549adc /lib/container | |
| parent | Releasing debian version 20180527-1. (diff) | |
| download | open-infrastructure-compute-tools-4eb8ddfe43f70976d7934a108527124d080b3f4e.tar.xz open-infrastructure-compute-tools-4eb8ddfe43f70976d7934a108527124d080b3f4e.zip | |
Merging upstream version 20180825.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/container')
| -rwxr-xr-x | lib/container/list | 2 | ||||
| -rwxr-xr-x | lib/container/start | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/lib/container/list b/lib/container/list index 6fa9eed..816d521 100755 --- a/lib/container/list +++ b/lib/container/list @@ -322,7 +322,7 @@ esac if ls "${MACHINES}"/* > /dev/null 2>&1 then - CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 -type d -and -not -name 'lost+found' -printf '%P\n' | sort)" + CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 \( -type d -or -type l \) -and -not -name 'lost+found' -printf '%P\n' | sort)" fi for CONTAINER in ${CONTAINERS} diff --git a/lib/container/start b/lib/container/start index 62fb926..ac0275e 100755 --- a/lib/container/start +++ b/lib/container/start @@ -161,18 +161,6 @@ case "${HOST_ARCHITECTURE}" in ;; esac ;; - - arm64) - case "${MACHINE_ARCHITECTURE}" in - armel|armhf) - SETARCH="setarch armv7l" - ;; - - *) - SETARCH="" - ;; - esac - ;; esac case "${START}" in |