Merge pull request #67 from manjaro/stable-0.15.x

Stable 0.15.x

bin/mkchrootpkg.in

@@ -235,7 +235,7 @@ EOF
 # These functions aren't run in makechrootpkg,
 # so no global variables
 _chrootbuild() {
-    export LC_ALL=C
+    export LC_ALL=en_US.UTF-8
     . /etc/profile
 #     export HOME=/build
 #     cd /startdir

lib/util-yaml.sh

@@ -356,9 +356,17 @@ write_settings_conf(){
     echo '' >> "$conf"
     echo "branding: ${iso_name}" >> "$conf"
     echo '' >> "$conf"
-    echo "prompt-install: false" >> "$conf"
+    if ${oem_used};then
+        echo "prompt-install: false" >> "$conf"
+    else
+        echo "prompt-install: true" >> "$conf"
+    fi
     echo '' >> "$conf"
-    echo "dont-chroot: false" >> "$conf"
+    if ${oem_used};then
+        echo "dont-chroot: true" >> "$conf"
+    else
+        echo "dont-chroot: false" >> "$conf"
+    fi
 }
 
 configure_calamares(){