forked from pool/yast2-installation
d8e21040f1
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=247
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 0699c238a48e136925f9e46dd281d7d6b7e3e325 Mon Sep 17 00:00:00 2001
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
|
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
|
|
|