Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:Factory checked in at 2015-11-02 12:55:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-config-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes
2015-05-24 19:33:49.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes
2015-11-02 12:55:04.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Oct 23 15:31:30 UTC 2015 - [email protected]
+
+- Rebase kiwi-config-openSUSE.changes: xdm's display-manager
+ received a minor fix.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-config-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.ofjfff/_old 2015-11-02 12:55:05.000000000 +0100
+++ /var/tmp/diff_new_pack.ofjfff/_new 2015-11-02 12:55:05.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kiwi-config-openSUSE
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ xdm-liveinstall.patch ++++++
--- /var/tmp/diff_new_pack.ofjfff/_old 2015-11-02 12:55:05.000000000 +0100
+++ /var/tmp/diff_new_pack.ofjfff/_new 2015-11-02 12:55:05.000000000 +0100
@@ -1,6 +1,27 @@
---- usr/lib/YaST2/startup/YaST2.call.orig 2011-02-17 14:54:48.000000000
+0000
-+++ usr/lib/YaST2/startup/YaST2.call 2011-04-08 08:01:31.000000000 +0000
-@@ -646,7 +646,9 @@
+Index: usr/lib/X11/display-manager
+===================================================================
+--- usr/lib/X11/display-manager.orig
++++ usr/lib/X11/display-manager
+@@ -182,7 +182,13 @@ case "$1" in
+ rc_exit
+ fi
+ fi
+- startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
++ if cat /proc/cmdline | grep -q liveinstall; then
++ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth quit
++ startproc -p $PIDFILE /usr/lib/YaST2/startup/YaST2.call
live-installer
++ else
++ startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
++ fi
++
+ if rc_status ; then
+ # when started up successfuly, use DMs PID file as ours
+ ln -snf $PIDFILE $PIDFILELNK
+Index: usr/lib/YaST2/startup/YaST2.call
+===================================================================
+--- usr/lib/YaST2/startup/YaST2.call.orig
++++ usr/lib/YaST2/startup/YaST2.call
+@@ -632,7 +632,9 @@ esac
# 8) Call YaST2
#---------------------------------------------
Y2_MODULE_NAME=${1:-installation}; shift
@@ -10,21 +31,3 @@
start_yast
#=============================================
-
---- usr/lib/X11/display-manager.orig 2012-09-19 14:09:30.000000000 +0000
-+++ usr/lib/X11/display-manager 2012-09-19 14:10:05.000000000 +0000
-@@ -182,7 +182,13 @@
- rc_exit
- fi
- fi
-- startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
-+ if cat /proc/cmdline | grep -q liveinstall; then
-+ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth quit
-+ startproc -p $PIDFILE /usr/lib/YaST2/startup/YaST2.call
live-installer
-+ else
-+ startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
-+ fi
-+
- # After a crash or a kill signal we may have
- # a wrong ownership of /dev/xconsole
- if rc_status ; then
