From 95981ad90a2c53a07e146ad68bf4c15ab448aa09 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 30 Oct 2020 05:13:09 +0100
Subject: Merging upstream version 20201030.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 lib/container/move | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/container/move')

diff --git a/lib/container/move b/lib/container/move
index 377bd7c..f87e5a8 100755
--- a/lib/container/move
+++ b/lib/container/move
@@ -98,7 +98,7 @@ then
 	exit 1
 fi
 
-STATE="$(machinectl show ${OLD} 2>&1 | awk -F= '/^State=/ { print $2 }')"
+STATE="$(machinectl show ${OLD} 2>&1 | awk -FState= '/^State=/ { print $2 }')"
 
 case "${STATE}" in
 	running)
@@ -132,7 +132,7 @@ case "${FORCE}" in
 esac
 
 # Pre hooks
-for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${NAME}.pre-${COMMAND}"
+for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${OLD}.pre-${COMMAND}"
 do
 	if [ -x "${FILE}" ]
 	then
@@ -145,7 +145,7 @@ mv "${CONFIG}/${OLD}.conf" "${CONFIG}/${NEW}.conf"
 mv "${MACHINES}/${OLD}" "${MACHINES}/${NEW}"
 
 # rw bind mounts
-BIND="$(awk -F= '/^bind=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+BIND="$(awk -Fbind= '/^bind=/ { print $2 }' ${CONFIG}/${NEW}.conf)"
 
 if [ -n "${BIND}" ]
 then
@@ -172,7 +172,7 @@ then
 fi
 
 # ro bind mounts
-BIND_RO="$(awk -F= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+BIND_RO="$(awk -Fbind-ro= '/^bind-ro=/ { print $2 }' ${CONFIG}/${NEW}.conf)"
 
 if [ -n "${BIND_RO}" ]
 then
@@ -202,7 +202,7 @@ fi
 sed -i -e "s|${OLD}|${NEW}|g" "${CONFIG}/${NEW}.conf"
 
 # Post hooks
-for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}"
+for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NEW}.post-${COMMAND}"
 do
 	if [ -x "${FILE}" ]
 	then
-- 
cgit v1.2.3