From 634ad9358e7f43bf87672c51db032cde5e3142fd Mon Sep 17 00:00:00 2001 From: Rachid Koucha <47061324+Rachid-Koucha@users.noreply.github.com> Date: Fri, 10 May 2019 07:39:03 +0200 Subject: [PATCH] Redirect error messages to stderr Some error messages were not redirected to stderr. Moreover, do "exit 0" instead of "exit 1" when "help" option is passed. Signed-off-by: Rachid Koucha --- templates/lxc-busybox.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in index 7f93ee4077..3601655036 100644 --- a/templates/lxc-busybox.in +++ b/templates/lxc-busybox.in @@ -185,7 +185,7 @@ configure_busybox() # copy busybox in the rootfs if ! cp "${BUSYBOX_EXE}" "${rootfs}/bin"; then - echo "ERROR: Failed to copy busybox binary" + echo "ERROR: Failed to copy busybox binary" 1>&2 return 1 fi @@ -287,7 +287,7 @@ eval set -- "$options" while true do case "$1" in - -h|--help) usage && exit 1;; + -h|--help) usage && exit 0;; -n|--name) name=$2; shift 2;; -p|--path) path=$2; shift 2;; --rootfs) rootfs=$2; shift 2;; @@ -307,7 +307,7 @@ fi # Make sure busybox is present BUSYBOX_EXE=`which busybox` if [ $? -ne 0 ]; then - echo "ERROR: Failed to find busybox binary" + echo "ERROR: Failed to find busybox binary" 1>&2 exit 1 fi @@ -322,21 +322,21 @@ if [ -z "$rootfs" ]; then fi if ! install_busybox "${rootfs}" "${name}"; then - echo "ERROR: Failed to install rootfs" + echo "ERROR: Failed to install rootfs" 1>&2 exit 1 fi if ! configure_busybox "${rootfs}"; then - echo "ERROR: Failed to configure busybox" + echo "ERROR: Failed to configure busybox" 1>&2 exit 1 fi if ! copy_configuration "${path}" "${rootfs}" "${name}"; then - echo "ERROR: Failed to write config file" + echo "ERROR: Failed to write config file" 1>&2 exit 1 fi if ! remap_userns "${path}"; then - echo "ERROR: Failed to change idmappings" + echo "ERROR: Failed to change idmappings" 1>&2 exit 1 fi