mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-20 14:01:36 +02:00
systemd: remove generic /usr/share/factory
This conflicts with our own configuration provided by baselayout.
This commit is contained in:
parent
0b9f05dac2
commit
093e482777
@ -411,6 +411,12 @@ multilib_src_install_all() {
|
|||||||
|
|
||||||
# Disable the "First Boot Wizard" by default, it isn't very applicable to CoreOS
|
# 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
|
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() {
|
migrate_locale() {
|
@ -402,6 +402,12 @@ multilib_src_install_all() {
|
|||||||
|
|
||||||
# Disable the "First Boot Wizard" by default, it isn't very applicable to CoreOS
|
# 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
|
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() {
|
migrate_locale() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user