From 739b30eb427214f07512e3c07536aa4c1652b626064ecb2f3fc4f9ded7a9b09c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Mon, 31 Oct 2011 08:30:29 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=155 --- yast2-installation-2.21.26.tar.bz2 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 yast2-installation-2.21.26.tar.bz2 diff --git a/yast2-installation-2.21.26.tar.bz2 b/yast2-installation-2.21.26.tar.bz2 new file mode 100644 index 0000000..79748cb --- /dev/null +++ b/yast2-installation-2.21.26.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c1df9ff237741b5cb5ec87df35a81bc383f56b22117cf49b77365ff5e05e10d +size 284464 From 3d36abaca528d2e75da4a3a7100750e1dc004b04153e4b346470faf4877dfcba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Mon, 31 Oct 2011 08:30:47 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=156 --- yast2-installation.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/yast2-installation.changes b/yast2-installation.changes index 0ac0ec1..1351579 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 31 09:18:46 CET 2011 - jsuchome@suse.cz + +- control files: save ecdsa keys (bnc#726468) +- 2.21.26 + ------------------------------------------------------------------- Wed Oct 19 16:25:41 CEST 2011 - locilka@suse.cz From 6ca9ec775545d006cacf31798e9ff8098a3358d75eb8b6cc1bcd96b19ece0707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Mon, 31 Oct 2011 08:30:56 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=157 --- yast2-installation.spec | 83 ++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/yast2-installation.spec b/yast2-installation.spec index 2ecc247..d75bac1 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -19,66 +19,67 @@ Name: yast2-installation -Version: 2.21.25 +Version: 2.21.26 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-installation-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0+ + +Group: System/YaST +License: GPL-2.0+ Summary: YaST2 - Installation Parts -Source1: YaST2-Second-Stage.service -Source2: YaST2-Firstboot.service +Source1: YaST2-Second-Stage.service +Source2: YaST2-Firstboot.service BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # FileSystems::possible_root_fs -BuildRequires: yast2-storage >= 2.19.12 +BuildRequires: yast2-storage >= 2.19.12 # xmllint -BuildRequires: libxml2 +BuildRequires: libxml2 # to convert control.rnc o control.rng -BuildRequires: trang +BuildRequires: trang # PackageCallbacks::RegisterEmptyProgressCallbacks() -BuildRequires: yast2 >= 2.16.52 +BuildRequires: yast2 >= 2.16.52 # Pkg::Add/RemoveUpgradeRepo() -BuildRequires: yast2-pkg-bindings >= 2.21.2 +BuildRequires: yast2-pkg-bindings >= 2.21.2 # Unified progress bar (done by visnov) -BuildRequires: yast2-packager >= 2.17.9 +BuildRequires: yast2-packager >= 2.17.9 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 # ProductControl::DisabledACItems, ::DisabledSubProposals -Requires: yast2 >= 2.18.23 +Requires: yast2 >= 2.18.23 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) -Requires: yast2-country-data >= 2.16.11 +Requires: yast2-country-data >= 2.16.11 # Pkg::SourceProvideDigestedFile() -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # Pkg::Add/RemoveUpgradeRepo() -Requires: yast2-pkg-bindings >= 2.21.2 +Requires: yast2-pkg-bindings >= 2.21.2 # Mouse-related scripts moved to yast2-mouse -Conflicts: yast2-mouse < 2.18.0 +Conflicts: yast2-mouse < 2.18.0 # New API for ProductLicense -Requires: yast2-packager >= 2.19.2 +Requires: yast2-packager >= 2.19.2 # FileSystems::possible_root_fs -Requires: yast2-storage >= 2.19.12 +Requires: yast2-storage >= 2.19.12 # use in startup scripts -Requires: initviocons +Requires: initviocons # Only in inst-sys # Requires: yast2-network @@ -87,23 +88,23 @@ Requires: initviocons # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile # pkg-bindings are not directly required -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # InstError -Conflicts: yast2 < 2.18.6 +Conflicts: yast2 < 2.18.6 # Added new function WFM::ClientExists -Conflicts: yast2-core < 2.17.10 +Conflicts: yast2-core < 2.17.10 # ButtonBox widget -Conflicts: yast2-ycp-ui-bindings < 2.17.3 +Conflicts: yast2-ycp-ui-bindings < 2.17.3 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) -Requires: tar gzip -Requires: coreutils +Requires: tar gzip +Requires: coreutils %if 0%{?suse_version} >= 1210 -BuildRequires: systemd-devel +BuildRequires: systemd-devel %{systemd_requires} %endif @@ -114,28 +115,28 @@ BuildRequires: systemd-devel #Requires: /usr/bin/pnmtopng # BNC 446533, /sbin/lspci called but not installed -Requires: pciutils +Requires: pciutils -Recommends: yast2-registration -Recommends: yast2-online-update -Recommends: yast2-users -Recommends: yast2-firewall -Recommends: release-notes -Recommends: curl -Recommends: yast2-update -Recommends: yast2-add-on +Recommends: yast2-registration +Recommends: yast2-online-update +Recommends: yast2-users +Recommends: yast2-firewall +Recommends: release-notes +Recommends: curl +Recommends: yast2-update +Recommends: yast2-add-on -PreReq: %fillup_prereq +PreReq: %fillup_prereq -BuildArch: noarch +BuildArch: noarch %package devel-doc Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 +Requires: yast2-installation >= 2.15.34 -PreReq: %fillup_prereq +PreReq: %fillup_prereq -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -248,5 +249,3 @@ rm -rf "$RPM_BUILD_ROOT" %doc %{_prefix}/share/doc/packages/yast2-installation %exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{_prefix}/share/doc/packages/yast2-installation/README - -%changelog From 812176f5a5d1adc7ea62119c9569de05b267f5093e97468aef40392733b051ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Sun, 6 Nov 2011 17:07:32 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=163 --- YaST2-Firstboot.service | 2 +- YaST2-Second-Stage.service | 2 +- yast2-installation-2.21.26.tar.bz2 | 3 --- yast2-installation-2.21.28.tar.bz2 | 3 +++ yast2-installation.changes | 14 ++++++++++++++ yast2-installation.spec | 2 +- 6 files changed, 20 insertions(+), 6 deletions(-) delete mode 100644 yast2-installation-2.21.26.tar.bz2 create mode 100644 yast2-installation-2.21.28.tar.bz2 diff --git a/YaST2-Firstboot.service b/YaST2-Firstboot.service index d7cb403..afd927f 100644 --- a/YaST2-Firstboot.service +++ b/YaST2-Firstboot.service @@ -1,7 +1,7 @@ [Unit] Description=YaST2 Firstboot After=apparmor.service local-fs.target YaST2-Second-Stage.service -Before=getty@tty1.service xdm.service +Before=getty@tty1.service xdm.service network.service NetworkManager.service ConditionPathExists=/var/lib/YaST2/reconfig_system [Service] diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service index 19c581f..aac77ea 100644 --- a/YaST2-Second-Stage.service +++ b/YaST2-Second-Stage.service @@ -1,7 +1,7 @@ [Unit] Description=YaST2 Second Stage After=apparmor.service local-fs.target -Before=getty@tty1.service xdm.service +Before=getty@tty1.service xdm.service network.service NetworkManager.service ConditionPathExists=/var/lib/YaST2/runme_at_boot [Service] diff --git a/yast2-installation-2.21.26.tar.bz2 b/yast2-installation-2.21.26.tar.bz2 deleted file mode 100644 index 79748cb..0000000 --- a/yast2-installation-2.21.26.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c1df9ff237741b5cb5ec87df35a81bc383f56b22117cf49b77365ff5e05e10d -size 284464 diff --git a/yast2-installation-2.21.28.tar.bz2 b/yast2-installation-2.21.28.tar.bz2 new file mode 100644 index 0000000..3aca5b9 --- /dev/null +++ b/yast2-installation-2.21.28.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ab7b36f823412b940a00d008abb28d7a9fccb396691b65a3fef3063acd90bf7 +size 284398 diff --git a/yast2-installation.changes b/yast2-installation.changes index 1351579..8da24bc 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Nov 03 11:52:08 CET 2011 - aschnell@suse.de + +- use same code to display ip addresses during vnc and ssh + installation (bnc#727802) +- 2.21.28 + +------------------------------------------------------------------- +Wed Nov 2 17:14:51 CET 2011 - fcrozat@suse.com + +- Ensure network is not started by systemd before Firstboot / + SecondStage (bnc#726823) +- 2.21.27 + ------------------------------------------------------------------- Mon Oct 31 09:18:46 CET 2011 - jsuchome@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index d75bac1..a4a3a2b 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -19,7 +19,7 @@ Name: yast2-installation -Version: 2.21.26 +Version: 2.21.28 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build From 72c1e7d66d4090d89b7d59cd8caececb95875c78f7abe48b534ef112629594c1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 7 Nov 2011 06:26:52 +0000 Subject: [PATCH 5/5] remove old sources OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=164 --- yast2-installation-2.21.25.tar.bz2 | 3 -- yast2-installation.spec | 81 +++++++++++++++--------------- 2 files changed, 41 insertions(+), 43 deletions(-) delete mode 100644 yast2-installation-2.21.25.tar.bz2 diff --git a/yast2-installation-2.21.25.tar.bz2 b/yast2-installation-2.21.25.tar.bz2 deleted file mode 100644 index e0a7b5b..0000000 --- a/yast2-installation-2.21.25.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eed825f1d097a29c9d8b743e5c5bc84a8535a0ee0d3dc44957ca5e9b47d32acc -size 307852 diff --git a/yast2-installation.spec b/yast2-installation.spec index a4a3a2b..125ab49 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -25,61 +25,60 @@ Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-installation-%{version}.tar.bz2 - -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0+ Summary: YaST2 - Installation Parts -Source1: YaST2-Second-Stage.service -Source2: YaST2-Firstboot.service +Source1: YaST2-Second-Stage.service +Source2: YaST2-Firstboot.service BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # FileSystems::possible_root_fs -BuildRequires: yast2-storage >= 2.19.12 +BuildRequires: yast2-storage >= 2.19.12 # xmllint -BuildRequires: libxml2 +BuildRequires: libxml2 # to convert control.rnc o control.rng -BuildRequires: trang +BuildRequires: trang # PackageCallbacks::RegisterEmptyProgressCallbacks() -BuildRequires: yast2 >= 2.16.52 +BuildRequires: yast2 >= 2.16.52 # Pkg::Add/RemoveUpgradeRepo() -BuildRequires: yast2-pkg-bindings >= 2.21.2 +BuildRequires: yast2-pkg-bindings >= 2.21.2 # Unified progress bar (done by visnov) -BuildRequires: yast2-packager >= 2.17.9 +BuildRequires: yast2-packager >= 2.17.9 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 # ProductControl::DisabledACItems, ::DisabledSubProposals -Requires: yast2 >= 2.18.23 +Requires: yast2 >= 2.18.23 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) -Requires: yast2-country-data >= 2.16.11 +Requires: yast2-country-data >= 2.16.11 # Pkg::SourceProvideDigestedFile() -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # Pkg::Add/RemoveUpgradeRepo() -Requires: yast2-pkg-bindings >= 2.21.2 +Requires: yast2-pkg-bindings >= 2.21.2 # Mouse-related scripts moved to yast2-mouse -Conflicts: yast2-mouse < 2.18.0 +Conflicts: yast2-mouse < 2.18.0 # New API for ProductLicense -Requires: yast2-packager >= 2.19.2 +Requires: yast2-packager >= 2.19.2 # FileSystems::possible_root_fs -Requires: yast2-storage >= 2.19.12 +Requires: yast2-storage >= 2.19.12 # use in startup scripts -Requires: initviocons +Requires: initviocons # Only in inst-sys # Requires: yast2-network @@ -88,23 +87,23 @@ Requires: initviocons # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile # pkg-bindings are not directly required -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # InstError -Conflicts: yast2 < 2.18.6 +Conflicts: yast2 < 2.18.6 # Added new function WFM::ClientExists -Conflicts: yast2-core < 2.17.10 +Conflicts: yast2-core < 2.17.10 # ButtonBox widget -Conflicts: yast2-ycp-ui-bindings < 2.17.3 +Conflicts: yast2-ycp-ui-bindings < 2.17.3 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) -Requires: tar gzip -Requires: coreutils +Requires: tar gzip +Requires: coreutils %if 0%{?suse_version} >= 1210 -BuildRequires: systemd-devel +BuildRequires: systemd-devel %{systemd_requires} %endif @@ -115,28 +114,28 @@ BuildRequires: systemd-devel #Requires: /usr/bin/pnmtopng # BNC 446533, /sbin/lspci called but not installed -Requires: pciutils +Requires: pciutils -Recommends: yast2-registration -Recommends: yast2-online-update -Recommends: yast2-users -Recommends: yast2-firewall -Recommends: release-notes -Recommends: curl -Recommends: yast2-update -Recommends: yast2-add-on +Recommends: yast2-registration +Recommends: yast2-online-update +Recommends: yast2-users +Recommends: yast2-firewall +Recommends: release-notes +Recommends: curl +Recommends: yast2-update +Recommends: yast2-add-on -PreReq: %fillup_prereq +PreReq: %fillup_prereq -BuildArch: noarch +BuildArch: noarch %package devel-doc Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 +Requires: yast2-installation >= 2.15.34 -PreReq: %fillup_prereq +PreReq: %fillup_prereq -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -249,3 +248,5 @@ rm -rf "$RPM_BUILD_ROOT" %doc %{_prefix}/share/doc/packages/yast2-installation %exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{_prefix}/share/doc/packages/yast2-installation/README + +%changelog