From d8e21040f13bcaa66dc98ebf304ef4e2b731e5cc21d564d7c73e6ee1e1a9f0ec Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 16 Jan 2013 10:20:32 +0000 Subject: [PATCH] - add hotfix to be reverted OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=247 --- ...c238a48e136925f9e46dd281d7d6b7e3e325.patch | 33 +++++++++++++++++++ yast2-installation.changes | 5 +++ yast2-installation.spec | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 0699c238a48e136925f9e46dd281d7d6b7e3e325.patch diff --git a/0699c238a48e136925f9e46dd281d7d6b7e3e325.patch b/0699c238a48e136925f9e46dd281d7d6b7e3e325.patch new file mode 100644 index 0000000..8b6a89a --- /dev/null +++ b/0699c238a48e136925f9e46dd281d7d6b7e3e325.patch @@ -0,0 +1,33 @@ +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 + diff --git a/yast2-installation.changes b/yast2-installation.changes index 9985c2b..79070b1 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 16 10:20:11 UTC 2013 - coolo@suse.com + +- add hotfix to be reverted + ------------------------------------------------------------------- Mon Jan 14 13:45:23 UTC 2013 - locilka@suse.com diff --git a/yast2-installation.spec b/yast2-installation.spec index d44559a..47cb848 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -29,6 +29,7 @@ Group: System/YaST Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service +Patch0: 0699c238a48e136925f9e46dd281d7d6b7e3e325.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen @@ -155,6 +156,7 @@ System installation code as present on installation media. %prep %setup -n yast2-installation-%{version} +%patch0 -p1 %build %{_prefix}/bin/y2tool y2autoconf