mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-09 06:06:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1018 from marineam/fixes

Browse Source 
Fixes for systemd/boot
This commit is contained in:
Michael Marineau 2014-12-18 18:04:44 -08:00
commit 5985e7511a
5 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r102.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r103.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild vendored
View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
else
CROS_WORKON_COMMIT="4f84a154d4eaf6d1e4d95087fb6ec091c8003333"
CROS_WORKON_COMMIT="da95154e87338e8d8b240b7cc1e541ba4c3821e9"
KEYWORDS="amd64 arm x86"
fi

1
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults vendored
View File

@ -18,6 +18,7 @@ INSTALL_MASK="${INSTALL_MASK}
/usr/share/gtk-doc
/usr/share/i18n
/usr/share/locale
/usr/share/zsh
/var/db/Makefile
"

6
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r4.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r5.ebuild vendored
View File

@ -411,6 +411,12 @@ multilib_src_install_all() {
# Disable the "First Boot Wizard" by default, it isn't very applicable to CoreOS
rm "${D}"/usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service
# Do not ship distro-specific files (nsswitch.conf pam.d)
rm -rf "${D}"/usr/share/factory
sed -i "${D}"/usr/lib/tmpfiles.d/etc.conf \
-e '/^C \/etc\/nsswitch\.conf/d' \
-e '/^C \/etc\/pam\.d/d'
}
migrate_locale() {

6
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild vendored
View File

@ -402,6 +402,12 @@ multilib_src_install_all() {
# Disable the "First Boot Wizard" by default, it isn't very applicable to CoreOS
rm "${D}"/usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service
# Do not ship distro-specific files (nsswitch.conf pam.d)
rm -rf "${D}"/usr/share/factory
sed -i "${D}"/usr/lib/tmpfiles.d/etc.conf \
-e '/^C \/etc\/nsswitch\.conf/d' \
-e '/^C \/etc\/pam\.d/d'
}
migrate_locale() {