Hello community, here is the log from the commit of package xdm for openSUSE:Factory checked in at 2017-02-10 09:47:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdm (Old) and /work/SRC/openSUSE:Factory/.xdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm" Changes: -------- --- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2017-01-11 11:52:53.454647033 +0100 +++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2017-02-10 09:47:25.743388919 +0100 @@ -1,0 +2,8 @@ +Mon Feb 6 13:20:21 UTC 2017 - [email protected] + +- no longer try to configure Linux console and X11 keymaps + according to setting in /etc/vconsole.conf; this needs to be done + via localectl by YaST itself now; /etc/X11/xdm/keytable removed + and no longer invoked by /usr/lib/X11/display-manager (bnc#1023211) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/keytable new/etc/X11/xdm/keytable --- old/etc/X11/xdm/keytable 2015-01-29 15:56:19.000000000 +0100 +++ new/etc/X11/xdm/keytable 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ -#! /bin/bash - -if [ $UID -ne 0 ]; then - echo "You need to be root to run this program" - exit 0 -fi - -vconsole_conf_file=/etc/vconsole.conf -sysconfig_file=/etc/sysconfig/keyboard -previous_x11conf_file=/etc/X11/xorg.conf.d/90-keytable.conf -systemd_x11conf_file=/etc/X11/xorg.conf.d/00-keyboard.conf -keyboard_map_systemd=/usr/share/systemd/kbd-model-map - -function setkeyboard { - echo "Command: localectl set-keymap $1" - # xorg.conf.d snippet is only written if a valid snippet is already - # available, so create an us sample if neccessary - if [ ! -f $systemd_x11conf_file ]; then - localectl set-x11-keymap us - fi - - # check systemd mapping - NEWKEYMAP=$(echo "$1" | sed "s/ $//" ) - opts=$(grep -P "^$NEWKEYMAP\t" "$keyboard_map_systemd" | sed -re "s/[^\t]*//" -e "s/[\t]+/ /g" ) - if [ -z "$opts" ]; then - echo "W: Cannot find mapping for $NEWKEYMAP in $keyboard_map_systemd" - echo "W: This will result in an 'us' X keyboard layout as default" - else - echo "I: Using systemd $keyboard_map_systemd mapping" - fi - - localectl set-keymap $1 - if [ -f $systemd_x11conf_file ]; then - if [ $systemd_x11conf_file -nt $previous_x11conf_file ]; then - rm -f $previous_x11conf_file - fi - exit 0 - else - echo "$systemd_x11conf_file has not been created!" - fi -} - -if [ -f $vconsole_conf_file ]; then - echo "$vconsole_conf_file available" - . $vconsole_conf_file - if [ ! -z $KEYMAP ]; then - echo "KEYMAP: $KEYMAP" - options="$KEYMAP $KEYMAP_TOGGLE" - setkeyboard "$options" - else - echo "KEYMAP not set" - fi -else - echo "$vconsole_conf_file not available" -fi - -if [ -f $sysconfig_file ]; then - echo "$sysconfig_file available" - . $sysconfig_file - if [ ! -z $KEYTABLE ]; then - # KEYTABLE=${KEYTABLE%%.*} can not be used, because - # lt.baltic.map.gz, lt.std.map.gz, lt.l4.map.gz - # and defkeymap_V1.0 have dot before .map.gz - KEYTABLE=${KEYTABLE%.gz} - KEYTABLE=${KEYTABLE%.map} - echo "KEYTABLE: $KEYTABLE" - options="$KEYTABLE" - setkeyboard "$options" - else - echo "KEYTABLE not set" - fi -else - echo "$sysconfig_file not available" -fi - -echo "Keyboard layout could not be set" -exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usr/lib/X11/display-manager new/usr/lib/X11/display-manager --- old/usr/lib/X11/display-manager 2015-10-07 09:25:18.000000000 +0200 +++ new/usr/lib/X11/display-manager 2017-02-06 14:19:33.541035000 +0100 @@ -144,11 +144,6 @@ case "$1" in start) - # use system keyboard as global X keyboard configuration - if [ -x /etc/X11/xdm/keytable ]; then - /etc/X11/xdm/keytable - fi - [ -n "$STARTPROC" ] && $STARTPROC echo -n "Starting service $DM" # Don't start xdm if no Xserver is configured and xdm is not
