From 9c0be56187f56073c2a511d560f75d291880a023d33ad1ab3224130527cc9aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Tue, 30 Aug 2011 09:41:32 +0000 Subject: [PATCH 1/7] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=111 --- YaST2-Firstboot.service | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 YaST2-Firstboot.service diff --git a/YaST2-Firstboot.service b/YaST2-Firstboot.service new file mode 100644 index 0000000..db15bf1 --- /dev/null +++ b/YaST2-Firstboot.service @@ -0,0 +1,15 @@ +[Unit] +Description=YaST2 Firstboot +After=apparmor.service local-fs.target YaST2-Second-Stage.service +Before=getty@tty1.service xdm.service +ConditionPathExists=/var/lib/YaST2/reconfig_system + +[Service] +Type=oneshot +#TTYPath=/var/lib/YaST2/run_suseconfig +#StandardOutput=tty +ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot +ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system + +[Install] +WantedBy=default.target From 82d1edaf1f514181f8d18665b90bf1a840767dbdbff12db347292df5150d86d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Tue, 30 Aug 2011 09:41:44 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=112 --- yast2-installation-2.21.15.tar.bz2 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 yast2-installation-2.21.15.tar.bz2 diff --git a/yast2-installation-2.21.15.tar.bz2 b/yast2-installation-2.21.15.tar.bz2 new file mode 100644 index 0000000..ea2290a --- /dev/null +++ b/yast2-installation-2.21.15.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4865352059715257916f7e926c66112ecb3942bf210ddced0dbb7411567a9459 +size 284539 From 7fd5b315c70992198a184d8b1599763ca9bc51a28e047d0e1a0559748339b43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Tue, 30 Aug 2011 09:41:56 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=113 --- yast2-installation.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/yast2-installation.changes b/yast2-installation.changes index d6d30f9..8cee2ed 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 29 12:12:55 CEST 2011 - jsuchome@suse.cz + +- added systemd .service files for second stage and firstboot + (from fcrozat@suse.com, bnc#713760) +- 2.21.15 + ------------------------------------------------------------------- Fri Aug 12 13:58:01 CEST 2011 - jsuchome@suse.cz From 4f47d018ce224f75c4acde8a9bf5d702d5220c36083263c3eecf63954a3ed429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Tue, 30 Aug 2011 09:42:05 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=114 --- yast2-installation.spec | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/yast2-installation.spec b/yast2-installation.spec index 4e440b9..c349f66 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,21 +1,30 @@ # -# spec file for package yast2-installation (Version 2.21.14) +# spec file for package yast2-installation (Version 2.21.15) # # norootforbuild Name: yast2-installation -Version: 2.21.14 +Version: 2.21.15 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.21.14.tar.bz2 +Source0: yast2-installation-2.21.15.tar.bz2 prefix: /usr Group: System/YaST License: GPL v2 or later + +Source1: YaST2-Second-Stage.service +Source2: YaST2-Firstboot.service + +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd-devel +%{systemd_requires} +%endif + 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 @@ -125,7 +134,7 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.21.14 +%setup -n yast2-installation-2.21.15 %build %{prefix}/bin/y2tool y2autoconf @@ -153,12 +162,30 @@ for f in `find %{buildroot}%{_datadir}/autoinstall/modules -name "*.desktop"`; d %suse_update_desktop_file $f done +mkdir -p $RPM_BUILD_ROOT/%{_unitdir} +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir} +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir} + %clean rm -rf "$RPM_BUILD_ROOT" %post %{fillup_only -ns security checksig} +%service_add YaST2-Second-Stage.service YaST2-Firstboot.service + +/bin/systemctl enable YaST2-Second-Stage.service > /dev/null 2>&1 || : +/bin/systemctl enable YaST2-Firstboot.service > /dev/null 2>&1 || : + +%preun +if [ $1 -eq 0 ]; then + /bin/systemctl disable YaST2-Second-Stage.service YaST2-Firstboot.service > /dev/null 2>&1 || : +fi +%service_del_preun YaST2-Second-Stage.service YaST2-Firstboot.service + +%postun +%service_del_postun YaST2-Second-Stage.service YaST2-Firstboot.service + %files %defattr(-,root,root) %dir /usr/share/YaST2/control @@ -167,6 +194,10 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/control/*.rng /usr/share/YaST2/control/*.rnc +# systemd service files +%_unitdir/YaST2-Second-Stage.service +%_unitdir/YaST2-Firstboot.service + /usr/share/YaST2/clients/*.ycp /usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ybc From 95086c98cdea80a076fe86c21cbb5c1d270f99a15e6ee9d665e930525d4a4812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Tue, 30 Aug 2011 09:42:13 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=115 --- YaST2-Second-Stage.service | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 YaST2-Second-Stage.service diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service new file mode 100644 index 0000000..a55c838 --- /dev/null +++ b/YaST2-Second-Stage.service @@ -0,0 +1,13 @@ +[Unit] +Description=YaST2 Second Stage +After=apparmor.service local-fs.target +Before=getty@tty1.service xdm.service +ConditionPathExists=/var/lib/YaST2/runme_at_boot + +[Service] +Type=oneshot +ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage +ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot + +[Install] +WantedBy=default.target From 030976fa56a6dac35e85cd1bdc3e5b297301d66f3fd4e501eb3be8e6d6e48013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Tue, 30 Aug 2011 09:42:17 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=116 --- yast2-installation-2.21.14.tar.bz2 | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 yast2-installation-2.21.14.tar.bz2 diff --git a/yast2-installation-2.21.14.tar.bz2 b/yast2-installation-2.21.14.tar.bz2 deleted file mode 100644 index f9f4eeb..0000000 --- a/yast2-installation-2.21.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9924b9419461f585755988586c87f79d2cf51052fbb338491fad2c9f2bcb1e81 -size 312783 From 530ce47c305931cdcf5e64365febba9d848d37942d6d77c82547f60d809d0e16 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 30 Aug 2011 11:15:50 +0000 Subject: [PATCH 7/7] workaround tool that Rudi is unavailable to fix OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=117 --- yast2-installation.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yast2-installation.spec b/yast2-installation.spec index c349f66..54d4aa5 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -22,7 +22,6 @@ Source2: YaST2-Firstboot.service %if 0%{?suse_version} >= 1210 BuildRequires: systemd-devel -%{systemd_requires} %endif BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite @@ -114,6 +113,7 @@ Recommends: yast2-update Recommends: yast2-add-on PreReq: %fillup_prereq +%{?systemd_requires} BuildArchitectures: noarch