use new keyboard layout feature

diff --git a/live.mk b/live.mk
index 27e1e76a5ab4e643047979d36e056b792bd185e1..ee7fe55f26d84adc5cc3f9d2c4222d8b1bfbccd2 100644 (file)
--- a/live.mk
+++ b/live.mk
@@ -45,6 +45,8 @@ timezone=Europe/Berlin
 ## Comma separated list of locales, first one will become default locale
 locales=de_DE.UTF-8 #,en_US.UTF-8
 
+keyboard=de
+
 ## If nodm is installed, you can choose a user to login automatically
 ## If no user is given here, then nodm will default to root
 nodm_user=live
@@ -60,8 +62,8 @@ nodm_user=live
 ## See modules/approx.mk if you need more flexibility
 # approx=http://localhost:9000/debian
 
-.PHONY: _live_initrd _favorites _kbdlayout #_bootmount
-_config: _live_initrd _favorites _kbdlayout #_bootmount
+.PHONY: _live_initrd _favorites #_kbdlayout #_bootmount
+_config: _live_initrd _favorites #_kbdlayout #_bootmount
 _live_initrd: cfg_root _live_modules
        # printf '%s\n' "isofs" "squashfs" "ata_generic" "usb_storage" "sr_mod" "mmc_block" >>"$${CFGROOT}/etc/initramfs-tools/modules"
        sed -i 's;^MODULES=.*$$;MODULES=most;' "$${CFGROOT}/etc/initramfs-tools/initramfs.conf"
@@ -82,8 +84,8 @@ _favorites: _xfce
        printf 'favorites=libreoffice-startcenter.desktop,firefox-esr.desktop,xfce4-terminal.desktop,org.kde.dolphin.desktop,mousepad.desktop,synaptic.desktop,aqemu.desktop,gparted.desktop' \
                >"$${CFGROOT}/etc/xdg/xfce4/panel/whiskermenu-10.rc"
 
-_kbdlayout: cfg_root
-       sed -Ei 's;^XKBLAYOUT=.*$$;XKBLAYOUT="de";;' "$${CFGROOT}/etc/default/keyboard"
+# _kbdlayout: cfg_root
+#      sed -Ei 's;^XKBLAYOUT=.*$$;XKBLAYOUT="de";;' "$${CFGROOT}/etc/default/keyboard"
 
-#_bootmount: cfg_root
-#      printf '/lib/live/mount/medium  /boot/  bind    auto,bind       0 0\n' >>"$${CFGROOT}/etc/fstab"
+# _bootmount: cfg_root
+#      printf '/lib/live/mount/medium  /boot/  bind    auto,bind       0 0\n' >>"$${CFGROOT}/etc/fstab"