Sascha Peilicke 2011-09-26 08:42:40 +00:00 committed by Git OBS Bridge
commit f7063d3c08
6 changed files with 70 additions and 52 deletions

View File

@ -2,14 +2,17 @@
Description=YaST2 Firstboot Description=YaST2 Firstboot
After=apparmor.service local-fs.target YaST2-Second-Stage.service After=apparmor.service local-fs.target YaST2-Second-Stage.service
Before=getty@tty1.service xdm.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] [Service]
Type=oneshot Type=oneshot
#TTYPath=/var/lib/YaST2/run_suseconfig ExecStartPre=/bin/touch /run/systemd/keep_running
#StandardOutput=tty
ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot
ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system
ExecStartPost=/bin/rm -f /run/systemd/keep_running
TimeoutSec=0
RemainAfterExit=true
[Install] [Install]
WantedBy=default.target WantedBy=default.target

View File

@ -2,12 +2,17 @@
Description=YaST2 Second Stage Description=YaST2 Second Stage
After=apparmor.service local-fs.target After=apparmor.service local-fs.target
Before=getty@tty1.service xdm.service 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] [Service]
Type=oneshot Type=oneshot
ExecStart=/bin/touch /run/systemd/keep_running
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage 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 /var/lib/YaST2/runme_at_boot
ExecStartPost=/bin/rm -f /run/systemd/keep_running
[Install] [Install]
WantedBy=default.target WantedBy=default.target

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:735f84769a9aa5014876ddbff6a076d64a846a2a23072ecd37b73d489992ed73
size 287099

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5789e1fe3097d92421b89994f570e2aaaade9e8422a651d4a7cf5ae653a6a262
size 302146

View File

@ -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 Thu Sep 15 12:16:49 UTC 2011 - lslezak@suse.cz

View File

@ -19,11 +19,11 @@
Name: yast2-installation Name: yast2-installation
Version: 2.21.18 Version: 2.21.20
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-installation-2.21.18.tar.bz2 Source0: yast2-installation-%{version}.tar.bz2
Prefix: /usr Prefix: /usr
@ -128,7 +128,7 @@ Recommends: yast2-add-on
PreReq: %fillup_prereq PreReq: %fillup_prereq
BuildArch: noarch BuildArchitectures: noarch
Summary: YaST2 - Installation Parts Summary: YaST2 - Installation Parts
@ -147,7 +147,7 @@ System installation code as present on installation media.
System installation code as present on installation media. System installation code as present on installation media.
%prep %prep
%setup -n yast2-installation-2.21.18 %setup -n yast2-installation-%{version}
%build %build
%{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2autoconf
@ -254,5 +254,3 @@ fi
%doc %{prefix}/share/doc/packages/yast2-installation %doc %{prefix}/share/doc/packages/yast2-installation
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README %exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog