diff options
-rw-r--r-- | hosts/alsvid200 | 8 | ||||
-rwxr-xr-x | inst | 27 |
2 files changed, 2 insertions, 33 deletions
diff --git a/hosts/alsvid200 b/hosts/alsvid200 index 14e06da..9df605f 100644 --- a/hosts/alsvid200 +++ b/hosts/alsvid200 @@ -21,12 +21,6 @@ extra_pkgs=' hostname='alsvid200' -kb_model='pc105' -kb_layout='us' -kb_variant='' -kb_options='' -kb_backspace='guess' - locale='en_US' supported_locales='en_US.UTF-8 en_DK.UTF-8' @@ -42,6 +36,8 @@ user_groups='adm cdrom floppy sudo audio dip video plugdev netdev' user_passwd_crypted='$6$.4kiiaCvfP$WZtL6RXtWtW0lIRnx2GyJwaN1OdkQUEHOulzxyXlS.dKTClhaI9Hkq3.bdE6TC613VqgEekwPgm3.T1D9CCuk0' debconf_selections=' + keyboard-configuration keyboard-configuration/layout select English (US) + keyboard-configuration keyboard-configuration/variant select English (US) wireshark-common wireshark-common/install-setuid boolean true ' @@ -267,32 +267,6 @@ do_apt_update() return 0 } -do_kb_setup() -{ - info 'Setting keyboard configuration' - - cat >"${target}/etc/default/keyboard.hack" <<-EOF - # Check /usr/share/doc/keyboard-configuration/README.Debian for - # documentation on what to do after having modified this file. - - # The following variables describe your keyboard and can have the same - # values as the XkbModel, XkbLayout, XkbVariant and XkbOptions options - # in /etc/X11/xorg.conf. - - XKBMODEL="${kb_model}" - XKBLAYOUT="${kb_layout}" - XKBVARIANT="${kb_variant}" - XKBOPTIONS="${kb_options}" - - # If you don't want to use the XKB layout on the console, you can - # specify an alternative keymap. Make sure it will be accessible - # before /usr is mounted. - # KMAP=/etc/console-setup/defkeymap.kmap.gz - BACKSPACE="${kb_backspace}" - EOF - ln -s keyboard.hack "${target}/etc/default/keyboard" -} - do_locale_setup() { local l= @@ -514,7 +488,6 @@ main() do_ chroot_setup || { do_ umount; return 1; } do_ fstab_setup || { do_ chroot_cleanup; do_ umount; return 1; } do_ apt_update || { do_ chroot_cleanup; do_ umount; return 1; } - do_ kb_setup || { do_ chroot_cleanup; do_ umount; return 1; } do_ locale_setup || { do_ chroot_cleanup; do_ umount; return 1; } do_ tz_setup || { do_ chroot_cleanup; do_ umount; return 1; } do_ user_setup || { do_ chroot_cleanup; do_ umount; return 1; } |