Accepting request 650560 from home:sbrabec:branches:Base:System

- Use setlogcons and dmesg instead of klogconsole;
  perform migration of sysconfig/boot file (boo#1116277).

OBS-URL: https://build.opensuse.org/request/show/650560
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=142

klog.service

@@ -29,12 +29,14 @@ Type=oneshot
 StandardError=tty
 StandardOutput=tty
 RemainAfterExit=yes
-Environment=KLOGCONSOLE_PARAMS=
+Environment=CONSOLE_LOGLEVEL=
+Environment=KLOG_CONSOLE=10
 EnvironmentFile=-/etc/sysconfig/boot
 ExecStart=/bin/sh -c "test -s /var/log/boot.msg && /bin/mv -f /var/log/boot.msg /var/log/boot.omsg || :"
 ExecStart=/bin/sh -c "/bin/dmesg -r > /var/log/boot.msg"
 ExecStart=/bin/sh -c "test -s /dev/shm/initrd.msg && /bin/cat /dev/shm/initrd.msg >> /var/log/boot.msg || :"
-ExecStart=/bin/sh -c "test -c /dev/tty10 && /usr/sbin/klogconsole $KLOGCONSOLE_PARAMS -r10 || :"
+ExecStart=/bin/sh -c "test -c /dev/tty$KLOG_CONSOLE && /usr/bin/setlogcons $KLOG_CONSOLE || :"
+ExecStart=/bin/sh -c "if test -n \"$CONSOLE_LOGLEVEL\" ; then /bin/dmesg -n $CONSOLE_LOGLEVEL || : ; fi"
 
 [Install]
 WantedBy=basic.target