rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 479267 from home:fbui:systemd:Factory

Browse Source 
- Initialize /etc/machine-id during the first boot (bsc#1024740)
  Previously that was done at package installation but it didn't fit
  well for appliance builds.

OBS-URL: https://build.opensuse.org/request/show/479267
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=974
This commit is contained in:
Franck Bui 2017-03-15 07:16:24 +00:00 committed by Git OBS Bridge
parent 362daf5ce8
commit 7811be6b3a
4 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
systemd-mini.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Mar 14 14:13:56 UTC 2017 - fbui@suse.com
- Initialize /etc/machine-id during the first boot (bsc#1024740)
Previously that was done at package installation but it didn't fit
well for appliance builds.
-------------------------------------------------------------------
Tue Mar 7 09:22:30 UTC 2017 - fbui@suse.com

12
systemd-mini.spec
View File

@ -646,13 +646,23 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
exit 0
%post
# Make /etc/machine-id an empty file during package installation. On
# the first boot, machine-id is initialized and either committed (if
# /etc/ is writable) or the system/image runs with a transient machine
# ID, that changes on each boot (if the image is read-only). This is
# especially important for appliance builds to avoid an identical
# machine ID in all images.
if [ $1 -eq 1 ]; then
touch %{_sysconfdir}/machine-id
chmod 666 %{_sysconfdir}/machine-id
fi
%sysusers_create /usr/lib/sysusers.d/systemd.conf
%if ! 0%{?bootstrap}
pam-config -a --systemd || :
%endif
ldconfig
[ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
systemd-machine-id-setup || :
/usr/lib/systemd/systemd-random-seed save || :
systemctl daemon-reexec || :
%journal_catalog_update

8
systemd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Mar 14 14:13:56 UTC 2017 - fbui@suse.com
- Initialize /etc/machine-id during the first boot (bsc#1024740)
Previously that was done at package installation but it didn't fit
well for appliance builds.
-------------------------------------------------------------------
Tue Mar 7 09:22:30 UTC 2017 - fbui@suse.com

12
systemd.spec
View File

@ -644,13 +644,23 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
exit 0
%post
# Make /etc/machine-id an empty file during package installation. On
# the first boot, machine-id is initialized and either committed (if
# /etc/ is writable) or the system/image runs with a transient machine
# ID, that changes on each boot (if the image is read-only). This is
# especially important for appliance builds to avoid an identical
# machine ID in all images.
if [ $1 -eq 1 ]; then
touch %{_sysconfdir}/machine-id
chmod 666 %{_sysconfdir}/machine-id
fi
%sysusers_create /usr/lib/sysusers.d/systemd.conf
%if ! 0%{?bootstrap}
pam-config -a --systemd || :
%endif
ldconfig
[ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
systemd-machine-id-setup || :
/usr/lib/systemd/systemd-random-seed save || :
systemctl daemon-reexec || :
%journal_catalog_update