Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2012-09-23 08:05:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-config-openSUSE", Maintainer is "co...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-08-04 09:19:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2012-09-23 08:05:15.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 19 14:07:48 UTC 2012 - co...@suse.com + +- add test for the xdm patch to apply cleanly - and fix it + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.7XcDjY/_old 2012-09-23 08:05:23.000000000 +0200 +++ /var/tmp/diff_new_pack.7XcDjY/_new 2012-09-23 08:05:23.000000000 +0200 @@ -26,6 +26,8 @@ BuildRequires: libxslt BuildRequires: skelcd-control-openSUSE BuildRequires: skelcd-openSUSE-CD +BuildRequires: xdm +BuildRequires: yast2-installation #opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf BuildRequires: jing BuildRequires: kiwi @@ -62,6 +64,11 @@ %prep %setup -T -c +testdir=$(mktemp -d) +install -D /usr/lib/YaST2/startup/YaST2.call $testdir/usr/lib/YaST2/startup/YaST2.call +install -D /etc/init.d/xdm $testdir/etc/init.d/xdm +cd $testdir +patch -p0 < %{SOURCE26} %build kiwiversion=12.2 ++++++ xdm-liveinstall.patch ++++++ --- /var/tmp/diff_new_pack.7XcDjY/_old 2012-09-23 08:05:23.000000000 +0200 +++ /var/tmp/diff_new_pack.7XcDjY/_new 2012-09-23 08:05:23.000000000 +0200 @@ -11,19 +11,20 @@ #============================================= ---- etc/init.d/xdm.orig 2011-04-12 10:21:03.911449606 +0200 -+++ etc/init.d/xdm 2011-04-12 10:21:43.831694748 +0200 -@@ -211,7 +211,12 @@ case "$1" in - fi - ;; - esac +--- etc/init.d/xdm.orig 2012-09-19 14:09:30.000000000 +0000 ++++ etc/init.d/xdm 2012-09-19 14:10:05.000000000 +0000 +@@ -208,7 +208,13 @@ + rc_exit + fi + fi - startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed -+ if cat /proc/cmdline | grep -q liveinstall; then ++ if cat /proc/cmdline | grep -q liveinstall; then + [ -x /usr/bin/plymouth ] && /usr/bin/plymouth quit + /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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org