From dbc29e3fcb8194889980a83136dc8b407047b7030cab2243fc2da1c37db991b4 Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Mon, 11 Jan 2016 15:37:38 +0000 Subject: [PATCH] - Removing network dependencies in the service files in order to prevent booting cycles in Tumbleweed. (bnc#954908) - 3.1.167 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=748 --- YaST2-Firstboot.service | 4 ++-- YaST2-Second-Stage.service | 2 +- yast2-installation-3.1.166.tar.bz2 | 3 --- yast2-installation-3.1.167.tar.bz2 | 3 +++ yast2-installation.changes | 7 +++++++ yast2-installation.spec | 4 ++-- 6 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 yast2-installation-3.1.166.tar.bz2 create mode 100644 yast2-installation-3.1.167.tar.bz2 diff --git a/YaST2-Firstboot.service b/YaST2-Firstboot.service index c955d32..1e93098 100644 --- a/YaST2-Firstboot.service +++ b/YaST2-Firstboot.service @@ -1,8 +1,8 @@ [Unit] Description=YaST2 Firstboot -After=apparmor.service local-fs.target YaST2-Second-Stage.service plymouth-start.service +After=apparmor.service local-fs.target plymouth-start.service Before=getty@tty1.service serial-getty@ttyS0.service serial-getty@ttyS1.service serial-getty@ttyS2.service -Before=display-manager.service network.service NetworkManager.service +Before=display-manager.service network.service ConditionPathExists=/var/lib/YaST2/reconfig_system [Service] diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service index 344254f..3eda3f7 100644 --- a/YaST2-Second-Stage.service +++ b/YaST2-Second-Stage.service @@ -4,7 +4,7 @@ Description=YaST2 Second Stage # initialization of the VNC server After=apparmor.service local-fs.target plymouth-start.service Before=getty@tty1.service serial-getty@ttyS0.service serial-getty@ttyS1.service serial-getty@ttyS2.service -Before=display-manager.service network.service NetworkManager.service SuSEfirewall2_init.service SuSEfirewall2.service +Before=display-manager.service ConditionPathExists=/var/lib/YaST2/runme_at_boot [Service] diff --git a/yast2-installation-3.1.166.tar.bz2 b/yast2-installation-3.1.166.tar.bz2 deleted file mode 100644 index 5086cc7..0000000 --- a/yast2-installation-3.1.166.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd4256a31f4310c53baf743eebee3557e9ecb82c7dc548f6a0b1271bb26c68c9 -size 396604 diff --git a/yast2-installation-3.1.167.tar.bz2 b/yast2-installation-3.1.167.tar.bz2 new file mode 100644 index 0000000..9d2310b --- /dev/null +++ b/yast2-installation-3.1.167.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11479e3bda0f3e56a4850f1a59372a61dcb1641d877227f2190003db4eb51ff9 +size 396470 diff --git a/yast2-installation.changes b/yast2-installation.changes index 6e95a5f..b98d959 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 22 15:53:34 CET 2015 - schubi@suse.de + +- Removing network dependencies in the service files in order to + prevent booting cycles in Tumbleweed. (bnc#954908) +- 3.1.167 + ------------------------------------------------------------------- Mon Dec 21 08:08:15 UTC 2015 - jsrain@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index 00eba88..8108c3e 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,7 +1,7 @@ # # spec file for package yast2-installation # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.166 +Version: 3.1.167 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build