From 2fa5ef841cf034263444f49b947d054e20f115cb1857123e7a88b9495ab2a0ed Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 16 Jan 2013 10:27:15 +0000 Subject: [PATCH] misunderstood patch OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=248 --- ...c238a48e136925f9e46dd281d7d6b7e3e325.patch | 33 ------------------- YaST2-Second-Stage.service | 5 ++- yast2-installation.spec | 2 -- 3 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 0699c238a48e136925f9e46dd281d7d6b7e3e325.patch diff --git a/0699c238a48e136925f9e46dd281d7d6b7e3e325.patch b/0699c238a48e136925f9e46dd281d7d6b7e3e325.patch deleted file mode 100644 index 8b6a89a..0000000 --- a/0699c238a48e136925f9e46dd281d7d6b7e3e325.patch +++ /dev/null @@ -1,33 +0,0 @@ -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-Second-Stage.service b/YaST2-Second-Stage.service index b29c2d2..fec9fb7 100644 --- a/YaST2-Second-Stage.service +++ b/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 diff --git a/yast2-installation.spec b/yast2-installation.spec index 47cb848..d44559a 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -29,7 +29,6 @@ Group: System/YaST Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service -Patch0: 0699c238a48e136925f9e46dd281d7d6b7e3e325.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen @@ -156,7 +155,6 @@ System installation code as present on installation media. %prep %setup -n yast2-installation-%{version} -%patch0 -p1 %build %{_prefix}/bin/y2tool y2autoconf