diff options
| author |   Eric Hameleers <alien@slackware.com> | 2017-01-23 16:56:17 +0100 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2017-01-23 16:56:17 +0100 |
| commit | ad247494598972b0727253f9812e117c18fb4e4b (patch) | |
| tree | 0d135b135226e199590261457d45247d880387e3 /liveinit.tpl | |
| parent | 734eb5ec860bea83c480d34437b0e3e729b66a5d (diff) | |
| parent | c81ada6132a864362044641705efb4a8986bf26e (diff) | |
| download | liveslak-ad247494598972b0727253f9812e117c18fb4e4b.tar.gz liveslak-ad247494598972b0727253f9812e117c18fb4e4b.tar.xz | |
Merge branch 'dlack'
New supported LIVEDE value: DLACK
This merge adds Dlackware as a DE choice when generating the ISO.
Dlackware is Slackware with PAM, systemd and Gnome3 (and without KDE4).
I think this is an interesting experiment. Know your enemy ;-)
Thanks to bartgymnast of the Dlackware team who provided the patches.
Diffstat (limited to '')
| -rwxr-xr-x | liveinit.tpl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/liveinit.tpl b/liveinit.tpl index 3b035c0..de23e24 100755 --- a/liveinit.tpl +++ b/liveinit.tpl @@ -814,6 +814,7 @@ if [ -x /usr/bin/loadkeys ]; then fi EOT chmod 755 /mnt/overlay/etc/rc.d/rc.keymap + echo "KEYMAP=${KEYMAP}" > /mnt/overlay/etc/vconsole.conf fi if [ ! -z "$KEYMAP" -o ! -z "$XKB" ]; then # Set a keyboard mapping in X.Org, derived from the console map if needed: @@ -890,6 +891,7 @@ EOT # Configure custom locale: echo "${MARKER}: Switching to '$LOCALE' locale" sed -i -e "s/^ *export LANG=.*/export LANG=${LOCALE}/" /mnt/overlay/etc/profile.d/lang.sh + echo "LANG=${LOCALE}" > /mnt/overlay/etc/locale.conf fi if [ ! -z "$TZ" -a -f /mnt/overlay/usr/share/zoneinfo/${TZ} ]; then |