forked from pool/yast2-installation
- add hotfix to be reverted
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=247
This commit is contained in:
parent
52eaea7c97
commit
d8e21040f1
33
0699c238a48e136925f9e46dd281d7d6b7e3e325.patch
Normal file
33
0699c238a48e136925f9e46dd281d7d6b7e3e325.patch
Normal file
@ -0,0 +1,33 @@
|
||||
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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user