From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 14 Jun 2018 00:54:32 +0000 (-0300)
Subject: Try a different approach for setting LC_ALL and DEBIAN_FRONTEND
X-Git-Tag: 0.1.0~221
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=dd4f7f7affb476f58f268e31125257efd55882c9;p=kvmx.git

Try a different approach for setting LC_ALL and DEBIAN_FRONTEND
---

diff --git a/kvmx b/kvmx
index 6856020..3420ca8 100755
--- a/kvmx
+++ b/kvmx
@@ -1857,6 +1857,10 @@ function kvmx_create {
   fi
 
   kvmx-create $KVMXFILE
+
+  if [ "$?" != "0" ]; then
+    exit $?
+  fi
 }
 
 # Dispatch
diff --git a/kvmx-create b/kvmx-create
index 9d4b8c9..43d0dac 100755
--- a/kvmx-create
+++ b/kvmx-create
@@ -260,10 +260,12 @@ function kvmx_create_custom {
   kvmx_sudo_run mount ${device}${partition_prefix}2 $WORK/
 
   # Trap $WORK umount
-  trap 'if [ -e "$WORK" ]; then umount $WORK/{sys,proc,dev} &> /dev/null; umount $WORK &> /dev/null; rmdir $WORK; fi' INT TERM
+  trap 'if [ -e "$WORK" ]; then umount $WORK/{sys,proc,dev} &> /dev/null; umount $WORK &> /dev/null; rmdir $WORK; fi' INT TERM EXIT
 
   # Non-interactive installation
-  APT_INSTALL="LC_ALL=C DEBIAN_FRONTEND=noninteractive kvmx_sudo_run chroot $WORK/ apt-get install -y"
+  #APT_INSTALL="LC_ALL=C DEBIAN_FRONTEND=noninteractive kvmx_sudo_run chroot $WORK/ apt-get install -y"
+  #APT_INSTALL="kvmx_sudo_run LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot $WORK/ apt-get install -y"
+  APT_INSTALL="kvmx_sudo_run chroot $WORK/ /usr/bin/env -- LC_ALL=C DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get install -y"
 
   # Initial system install.
   echo "Installing base system..."