diff --git a/YaST2-Firstboot.service b/YaST2-Firstboot.service index db15bf1..8cdb491 100644 --- a/YaST2-Firstboot.service +++ b/YaST2-Firstboot.service @@ -2,14 +2,17 @@ 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 +ConditionPathExists=|/var/lib/YaST2/reconfig_system +ConditionPathExists=|/run/systemd/keep_running [Service] Type=oneshot -#TTYPath=/var/lib/YaST2/run_suseconfig -#StandardOutput=tty +ExecStartPre=/bin/touch /run/systemd/keep_running ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system +ExecStartPost=/bin/rm -f /run/systemd/keep_running +TimeoutSec=0 +RemainAfterExit=true [Install] WantedBy=default.target diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service index a55c838..c06b34c 100644 --- a/YaST2-Second-Stage.service +++ b/YaST2-Second-Stage.service @@ -2,12 +2,17 @@ Description=YaST2 Second Stage After=apparmor.service local-fs.target Before=getty@tty1.service xdm.service -ConditionPathExists=/var/lib/YaST2/runme_at_boot +ConditionPathExists=|/var/lib/YaST2/runme_at_boot +ConditionPathExists=|/run/systemd/keep_running [Service] Type=oneshot +ExecStart=/bin/touch /run/systemd/keep_running ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage +RemainAfterExit=yes +TimeoutSec=0 ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot +ExecStartPost=/bin/rm -f /run/systemd/keep_running [Install] WantedBy=default.target diff --git a/yast2-installation-2.21.18.tar.bz2 b/yast2-installation-2.21.18.tar.bz2 deleted file mode 100644 index f8e473c..0000000 --- a/yast2-installation-2.21.18.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:735f84769a9aa5014876ddbff6a076d64a846a2a23072ecd37b73d489992ed73 -size 287099 diff --git a/yast2-installation-2.21.20.tar.bz2 b/yast2-installation-2.21.20.tar.bz2 new file mode 100644 index 0000000..0033d1a --- /dev/null +++ b/yast2-installation-2.21.20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5789e1fe3097d92421b89994f570e2aaaade9e8422a651d4a7cf5ae653a6a262 +size 302146 diff --git a/yast2-installation.changes b/yast2-installation.changes index f0fdee4..378b24c 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Sep 23 15:36:11 CEST 2011 - jsuchome@suse.cz + +- updated systemd service files (bnc#719221) +- 2.21.20 + +------------------------------------------------------------------- +Fri Sep 23 14:27:36 CEST 2011 - jsuchome@suse.cz + +- unmount previously mounted /run (bnc#717321) +- 2.21.19 + ------------------------------------------------------------------- Thu Sep 15 12:16:49 UTC 2011 - lslezak@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index 0105f37..b631946 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -19,72 +19,72 @@ Name: yast2-installation -Version: 2.21.18 +Version: 2.21.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.21.18.tar.bz2 +Source0: yast2-installation-%{version}.tar.bz2 Prefix: /usr -Group: System/YaST -License: GPL v2 or later +Group: System/YaST +License: GPL v2 or later -Source1: YaST2-Second-Stage.service -Source2: YaST2-Firstboot.service +Source1: YaST2-Second-Stage.service +Source2: YaST2-Firstboot.service %if 0%{?suse_version} >= 1210 -BuildRequires: systemd-devel +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 -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 @@ -93,20 +93,20 @@ 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 # for the first/second stage of installation # currently not used @@ -115,30 +115,30 @@ Requires: coreutils #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 +BuildArchitectures: noarch -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %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. @@ -147,7 +147,7 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.21.18 +%setup -n yast2-installation-%{version} %build %{prefix}/bin/y2tool y2autoconf @@ -254,5 +254,3 @@ fi %doc %{prefix}/share/doc/packages/yast2-installation %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README - -%changelog