mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-28 22:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

sys-apps/baselayout: Initialize the user/group database earlier

Browse Source 
systemd-tmpfiles in systemd v246 requires the user/group databases in
the custom root if it gets passed with --root flag. This requires a
new version of baselayout to be pulled, so do so.
This commit is contained in:
Krzesimir Nowak 2020-09-11 22:09:36 +02:00
parent 4e86e2c3aa
commit 0d1f86c398
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.7.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8.ebuild vendored
View File

14
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild vendored
View File

@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else else
CROS_WORKON_COMMIT="b67c163348c69b7c02dac1bb087b1a15cf21afa7" # flatcar-master CROS_WORKON_COMMIT="df037edbeab79c38caed61f48dec7a00e764e20e" # flatcar-master
KEYWORDS="amd64 arm arm64 x86" KEYWORDS="amd64 arm arm64 x86"
fi fi
@ -113,6 +113,17 @@ src_install() {
for sym in "${!LIB_SYMS[@]}" ; do for sym in "${!LIB_SYMS[@]}" ; do
dosym "${LIB_SYMS[$sym]}" "${sym}" dosym "${LIB_SYMS[$sym]}" "${sym}"
done done
if use cros_host; then
# We assume that SDK already has the user and group database.
:
else
# Initialize /etc/passwd, group, and friends now, so
# systemd-tmpfiles can resolve user information in ${D}
# rootfs.
bash "scripts/flatcar-tmpfiles" "${D}" "${S}/baselayout" || die
fi
if use symlink-usr; then if use symlink-usr; then
systemd_dotmpfilesd "${T}/baselayout-usr.conf" systemd_dotmpfilesd "${T}/baselayout-usr.conf"
systemd-tmpfiles --root="${D}" --create systemd-tmpfiles --root="${D}" --create
@ -181,7 +192,6 @@ src_install() {
"${D}"/usr/lib/tmpfiles.d/baselayout-etc.conf || die "${D}"/usr/lib/tmpfiles.d/baselayout-etc.conf || die
# Initialize /etc/passwd, group, and friends on boot. # Initialize /etc/passwd, group, and friends on boot.
bash "scripts/flatcar-tmpfiles" "${D}" || die
dosbin "scripts/flatcar-tmpfiles" dosbin "scripts/flatcar-tmpfiles"
systemd_dounit "scripts/flatcar-tmpfiles.service" systemd_dounit "scripts/flatcar-tmpfiles.service"
systemd_enable_service sysinit.target flatcar-tmpfiles.service systemd_enable_service sysinit.target flatcar-tmpfiles.service