From 4eb8ddfe43f70976d7934a108527124d080b3f4e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 Aug 2018 15:04:13 +0200 Subject: Merging upstream version 20180825. Signed-off-by: Daniel Baumann --- lib/container/list | 2 +- lib/container/start | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) (limited to 'lib') 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 -- cgit v1.2.3