[Lunar-commits] <lunar-iso> A few more sane defaults

[Stefan Wold]

commit 1d66de2736f393d3417de2f82e897bbbfe209183
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sun, 12 Jan 2014 09:30:29 -0800
URL: https://github.com/lunar-linux/lunar-iso/commit/1d66de2736f393d3417de2f82e897bbbfe209183

A few more sane defaults
---
  lunar-install/sbin/lunar-install | +6/-1     
  1 file changed, 6 insertions(+), 1 deletion(-)

--- a/lunar-install/sbin/lunar-install
+++ b/lunar-install/sbin/lunar-install
@@ -1187,7 +1187,10 @@ transfer()
       cp /etc/issue{,.net} $TARGET/etc/
 
       # Some sane defaults
+      GCCVER=$(chroot_run lvu installed gcc | awk -F\. '{ print $1"_"$2 }')
+
       cat <<EOF> $TARGET/etc/lunar/local/config
+  LUNAR_COMPILER="GCC_$GCCVER"
     LUNAR_MODULE="lunar"
 LUNAR_ALIAS_UDEV="systemd"
 LUNAR_ALIAS_KMOD="kmod"
@@ -1404,7 +1407,7 @@ Please select your preferred langauge.
 This process will ONLY set the LANG environment variable. Do
 not expect any changes till you finish and reboot."
 
-  LANG=${LANG:-en_US}
+  LANG=${LANG:-en_US.utf8}
   LANG=$($DIALOG --title "Language Selection Menu" --default-item "$LANG" --menu "$HELP" 0 0 0 `show_languages`)
   if [ $? == 0 ]; then
     export LANG
@@ -1814,6 +1817,8 @@ main()
   # setting this var is supposed to prevent the enviro_check code now!
   export LUNAR_INSTALL=1
 
+  unset EDITOR
+
   TARGET="/mnt"
   CONFIRM=on
   GUIDE=on