rpm/yast2-installation
SHA256
1
0
Fork 0
forked from pool/yast2-installation
Code Pull Requests Activity

misunderstood patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=248
This commit is contained in:
Stephan Kulow 2013-01-16 10:27:15 +00:00 committed by Git OBS Bridge
parent d8e21040f1
commit 2fa5ef841c
3 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0699c238a48e136925f9e46dd281d7d6b7e3e325.patch
View File

@ -1,33 +0,0 @@
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

5
YaST2-Second-Stage.service
View File

@ -1,12 +1,15 @@
[Unit] [Unit]
Description=YaST2 Second Stage Description=YaST2 Second Stage
After=apparmor.service local-fs.target plymouth-start.service 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 ConditionPathExists=/var/lib/YaST2/runme_at_boot
[Service] [Service]
Type=oneshot Type=oneshot
Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux 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 ExecStartPre=-/usr/bin/plymouth --hide-splash
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes RemainAfterExit=yes

2
yast2-installation.spec
View File

@ -29,7 +29,6 @@ Group: System/YaST
Source1: YaST2-Second-Stage.service Source1: YaST2-Second-Stage.service
Source2: YaST2-Firstboot.service Source2: YaST2-Firstboot.service
Patch0: 0699c238a48e136925f9e46dd281d7d6b7e3e325.patch
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen BuildRequires: doxygen
@ -156,7 +155,6 @@ System installation code as present on installation media.
%prep %prep
%setup -n yast2-installation-%{version} %setup -n yast2-installation-%{version}
%patch0 -p1
%build %build
%{_prefix}/bin/y2tool y2autoconf %{_prefix}/bin/y2tool y2autoconf