mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-03 11:32:02 +02:00
fix(sys-libs/glibc): Remove nsswitch.conf transitional symlink code
The transition to the new baselayout is complete so this can go away.
This commit is contained in:
parent
aa140ca72c
commit
250c39b2d2
@ -209,23 +209,7 @@ eblit-pkg_preinst-post() {
|
||||
|
||||
# CoreOS tweaks:
|
||||
# - drop host.conf and gai.conf
|
||||
# - move/symlink nsswitch.conf and rpc.
|
||||
# These are moving to baselayout+usrfiles and glibc shouldn't conflict
|
||||
# - nsswitch.conf and rpc are provided by baselayout
|
||||
eblit-src_install-post() {
|
||||
dodir /usr/share/glibc
|
||||
local move
|
||||
for move in nsswitch.conf rpc ; do
|
||||
[ -f "${D}/etc/${move}" ] || continue
|
||||
mv "${D}/etc/${move}" "${D}"/usr/share/glibc || die
|
||||
done
|
||||
rm -f "${D}"/etc/{gai.conf,host.conf} || die
|
||||
}
|
||||
|
||||
eblit-pkg_postinst-post() {
|
||||
local sym
|
||||
for sym in nsswitch.conf rpc ; do
|
||||
[ ! -f "${ROOT}/etc/${sym}" ] || continue
|
||||
[ -f "${ROOT}/usr/share/glibc/${sym}" ] || continue
|
||||
ln -sf "../usr/share/glibc/${sym}" "${ROOT}/etc/${sym}" || die
|
||||
done
|
||||
rm -f "${D}"/etc/{gai.conf,host.conf,nsswitch.conf,rpc} || die
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user