Commit bc51cf5c8074da99ef2acf478b2cd36bbea2aaea

Authored by Silvan Calarco
1 parent 10067eb5b0
Exists in master

installer.sh/installer.conf: more safe setting of LANG in /etc/locale.conf

Showing 2 changed files with 4 additions and 3 deletions Side-by-side Diff

installer/installer.kmdr
... ... @@ -953,7 +953,7 @@
953 953 *) LANGUAGE="${Language}" ;;
954 954 esac
955 955 LANGUAGE=${LANGUAGE:0:5}.UTF-8
956   - sudo sed -i "s|LANG=.*|LANG=$LANGUAGE|" /etc/locale.conf
  956 + sudo sed -i "/^LANG=.*/d;1s/^/LANG=$LANGUAGE\n/" /etc/locale.conf
957 957 fi
958 958 fi
959 959 @execEnd
installer/installer.sh
1 1 # openmamba installation script
2   -# Copyright (c) 2007-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
  2 +# Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
3 3 #
4 4 # For the devfs2gdev() function:
5 5 # Copyright (c) 2006 by Davide Madrisan <davide.madrisan@gmail.com>
6 6  
... ... @@ -361,11 +361,12 @@
361 361 ${MOUNT_SPACE} Mbytes copied
362 362 Installation time: $TIME_ELAPSED minutes"
363 363  
364   -CONFIGURED_FILES="/etc/sysconfig/keyboard /etc/sysconfig/i18n /etc/vconsole.conf /etc/locale.conf \
  364 +CONFIGURED_FILES="/etc/vconsole.conf /etc/locale.conf \
365 365 /etc/X11/xorg.conf /etc/X11/xorg.conf.d/10-keyboard.conf /etc/X11/xorg.conf.d/20-touchpad.conf"
366 366 for f in $CONFIGURED_FILES; do
367 367 cp $f ${MOUNTPOINT}/${f}
368 368 done
  369 +sed -i "/^LANG=.*/d;1s/^/LANG=$LANG\n/" /etc/locale.conf
369 370 echo
370 371  
371 372 mkdir -p $MOUNTPOINT/{dev,home,initrd,media,mnt,proc,run,sys,tmp}