- remove SysVStartPriority= from after-local.service,
unsupported since v218. Note that this option was only parsed and that's it. the logic to give "start priority" was never implemented. - change the default fallback ntp servers to the opensuse pool.ntp.org vendor zone. - We still need to run systemd-sysctl.service after local-fs.target otherwise it works only when /boot is in the root filesystem but not when it is a separate partition. - remove SysVStartPriority= from after-local.service, unsupported since v218. Note that this option was only parsed and that's it. the logic to give "start priority" was never implemented. - change the default fallback ntp servers to the opensuse pool.ntp.org vendor zone. - We still need to run systemd-sysctl.service after local-fs.target otherwise it works only when /boot is in the root filesystem but not when it is a separate partition. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=880
This commit is contained in:
parent
484571bda8
commit
2c26a33fa2
@ -15,4 +15,3 @@ Type=idle
|
|||||||
ExecStart=/etc/init.d/after.local
|
ExecStart=/etc/init.d/after.local
|
||||||
TimeoutSec=0
|
TimeoutSec=0
|
||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
SysVStartPriority=99
|
|
||||||
|
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 1 03:43:51 UTC 2015 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
- remove SysVStartPriority= from after-local.service,
|
||||||
|
unsupported since v218.
|
||||||
|
Note that this option was only parsed and that's it. the logic
|
||||||
|
to give "start priority" was never implemented.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 1 03:20:20 UTC 2015 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
- change the default fallback ntp servers to the opensuse
|
||||||
|
pool.ntp.org vendor zone.
|
||||||
|
- We still need to run systemd-sysctl.service after local-fs.target
|
||||||
|
otherwise it works only when /boot is in the root filesystem but
|
||||||
|
not when it is a separate partition.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jun 26 17:14:46 CEST 2015 - sbrabec@suse.com
|
Fri Jun 26 17:14:46 CEST 2015 - sbrabec@suse.com
|
||||||
|
|
||||||
|
@ -686,6 +686,7 @@ cflags -Wl,-O2 LDFLAGS
|
|||||||
cflags -Wl,--hash-size=8599 LDFLAGS
|
cflags -Wl,--hash-size=8599 LDFLAGS
|
||||||
# keep split-usr until all packages have moved their systemd rules to /usr
|
# keep split-usr until all packages have moved their systemd rules to /usr
|
||||||
%configure \
|
%configure \
|
||||||
|
--with-ntp-servers="0.opensuse.pool.ntp.org 1.opensuse.pool.ntp.org 2.opensuse.pool.ntp.org 3.opensuse.pool.ntp.org" \
|
||||||
--docdir=%{_docdir}/systemd \
|
--docdir=%{_docdir}/systemd \
|
||||||
--with-pamlibdir=/%{_lib}/security \
|
--with-pamlibdir=/%{_lib}/security \
|
||||||
--with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d \
|
--with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d \
|
||||||
@ -844,6 +845,13 @@ d! /run/sysctl.d
|
|||||||
L! /run/sysctl.d/00-kernel-%v.conf - - - - /boot/sysctl.conf-%v
|
L! /run/sysctl.d/00-kernel-%v.conf - - - - /boot/sysctl.conf-%v
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system/systemd-sysctl.service.d
|
||||||
|
|
||||||
|
cat << EOF > %{buildroot}/%{_prefix}/lib/systemd/system/systemd-sysctl.service.d/after.conf
|
||||||
|
[Unit]
|
||||||
|
After=local-fs.target
|
||||||
|
EOF
|
||||||
|
|
||||||
# ensure after.local wrapper is called
|
# ensure after.local wrapper is called
|
||||||
install -m 644 %{S:11} %{buildroot}/%{_prefix}/lib/systemd/system/
|
install -m 644 %{S:11} %{buildroot}/%{_prefix}/lib/systemd/system/
|
||||||
ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/
|
ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/
|
||||||
@ -1208,6 +1216,8 @@ exit 0
|
|||||||
%dir %{_prefix}/lib/systemd/system/dbus.target.wants
|
%dir %{_prefix}/lib/systemd/system/dbus.target.wants
|
||||||
%dir %{_prefix}/lib/systemd/system/getty@tty1.service.d
|
%dir %{_prefix}/lib/systemd/system/getty@tty1.service.d
|
||||||
%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
|
%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
|
||||||
|
%dir %{_prefix}/lib/systemd/system/systemd-sysctl.service.d
|
||||||
|
%{_prefix}/lib/systemd/system/systemd-sysctl.service.d/after.conf
|
||||||
%if ! 0%{?bootstrap}
|
%if ! 0%{?bootstrap}
|
||||||
%{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
|
%{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
|
||||||
%endif
|
%endif
|
||||||
|
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 1 03:43:51 UTC 2015 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
- remove SysVStartPriority= from after-local.service,
|
||||||
|
unsupported since v218.
|
||||||
|
Note that this option was only parsed and that's it. the logic
|
||||||
|
to give "start priority" was never implemented.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 1 03:20:20 UTC 2015 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
- change the default fallback ntp servers to the opensuse
|
||||||
|
pool.ntp.org vendor zone.
|
||||||
|
- We still need to run systemd-sysctl.service after local-fs.target
|
||||||
|
otherwise it works only when /boot is in the root filesystem but
|
||||||
|
not when it is a separate partition.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jun 26 17:14:46 CEST 2015 - sbrabec@suse.com
|
Fri Jun 26 17:14:46 CEST 2015 - sbrabec@suse.com
|
||||||
|
|
||||||
|
10
systemd.spec
10
systemd.spec
@ -681,6 +681,7 @@ cflags -Wl,-O2 LDFLAGS
|
|||||||
cflags -Wl,--hash-size=8599 LDFLAGS
|
cflags -Wl,--hash-size=8599 LDFLAGS
|
||||||
# keep split-usr until all packages have moved their systemd rules to /usr
|
# keep split-usr until all packages have moved their systemd rules to /usr
|
||||||
%configure \
|
%configure \
|
||||||
|
--with-ntp-servers="0.opensuse.pool.ntp.org 1.opensuse.pool.ntp.org 2.opensuse.pool.ntp.org 3.opensuse.pool.ntp.org" \
|
||||||
--docdir=%{_docdir}/systemd \
|
--docdir=%{_docdir}/systemd \
|
||||||
--with-pamlibdir=/%{_lib}/security \
|
--with-pamlibdir=/%{_lib}/security \
|
||||||
--with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d \
|
--with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d \
|
||||||
@ -839,6 +840,13 @@ d! /run/sysctl.d
|
|||||||
L! /run/sysctl.d/00-kernel-%v.conf - - - - /boot/sysctl.conf-%v
|
L! /run/sysctl.d/00-kernel-%v.conf - - - - /boot/sysctl.conf-%v
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system/systemd-sysctl.service.d
|
||||||
|
|
||||||
|
cat << EOF > %{buildroot}/%{_prefix}/lib/systemd/system/systemd-sysctl.service.d/after.conf
|
||||||
|
[Unit]
|
||||||
|
After=local-fs.target
|
||||||
|
EOF
|
||||||
|
|
||||||
# ensure after.local wrapper is called
|
# ensure after.local wrapper is called
|
||||||
install -m 644 %{S:11} %{buildroot}/%{_prefix}/lib/systemd/system/
|
install -m 644 %{S:11} %{buildroot}/%{_prefix}/lib/systemd/system/
|
||||||
ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/
|
ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/
|
||||||
@ -1203,6 +1211,8 @@ exit 0
|
|||||||
%dir %{_prefix}/lib/systemd/system/dbus.target.wants
|
%dir %{_prefix}/lib/systemd/system/dbus.target.wants
|
||||||
%dir %{_prefix}/lib/systemd/system/getty@tty1.service.d
|
%dir %{_prefix}/lib/systemd/system/getty@tty1.service.d
|
||||||
%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
|
%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
|
||||||
|
%dir %{_prefix}/lib/systemd/system/systemd-sysctl.service.d
|
||||||
|
%{_prefix}/lib/systemd/system/systemd-sysctl.service.d/after.conf
|
||||||
%if ! 0%{?bootstrap}
|
%if ! 0%{?bootstrap}
|
||||||
%{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
|
%{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
Reference in New Issue
Block a user