Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2013-01-16 11:20:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "jsuchome@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2013-01-16 11:19:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2013-01-16 11:20:34.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 16 10:20:11 UTC 2013 - coolo@suse.com + +- add hotfix to be reverted + +------------------------------------------------------------------- New: ---- 0699c238a48e136925f9e46dd281d7d6b7e3e325.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.T5ZaqR/_old 2013-01-16 11:20:34.000000000 +0100 +++ /var/tmp/diff_new_pack.T5ZaqR/_new 2013-01-16 11:20:34.000000000 +0100 @@ -29,6 +29,7 @@ Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service +Patch0: 0699c238a48e136925f9e46dd281d7d6b7e3e325.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen @@ -155,6 +156,7 @@ %prep %setup -n yast2-installation-%{version} +%patch0 -p1 %build %{_prefix}/bin/y2tool y2autoconf ++++++ 0699c238a48e136925f9e46dd281d7d6b7e3e325.patch ++++++
From 0699c238a48e136925f9e46dd281d7d6b7e3e325 Mon Sep 17 00:00:00 2001 From: Frederic Crozat
Date: Wed, 16 Jan 2013 10:56:18 +0100 Subject: [PATCH] clear SuSEfirewall2 from systemd startup queue (bnc#798620)
--- package/YaST2-Second-Stage.service | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/YaST2-Second-Stage.service b/package/YaST2-Second-Stage.service index f5202d6..d3a9639 100644 --- a/package/YaST2-Second-Stage.service +++ b/package/YaST2-Second-Stage.service @@ -1,12 +1,15 @@ [Unit] Description=YaST2 Second Stage After=apparmor.service local-fs.target plymouth-start.service -Before=getty@tty1.service xdm.service network.service NetworkManager.service SuSEfirewall2_init.service +Before=getty@tty1.service xdm.service network.service NetworkManager.service SuSEfirewall2_init.service SuSEfirewall2.service ConditionPathExists=/var/lib/YaST2/runme_at_boot [Service] Type=oneshot Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux +# firewall will be started by YaST Second Stage +# ensure current queue doesn't block YaST starting it +ExecStartPre=-/bin/systemctl stop SuSEfirewall2.service ExecStartPre=-/usr/bin/plymouth --hide-splash ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage RemainAfterExit=yes -- 1.7.10 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org