fix(sys-apps/baselayout): Create resolv.conf symlink except in SDK

networkd uses its own location for generating resolv.conf and a new
tmpfiles rule creates a symlink to it in both -generic and -usr images.
This is not applicable to SDK so remove the rule in that case.
This commit is contained in:
Michael Marineau 2014-03-05 23:23:54 -08:00
parent 39e9317596
commit f876a41a38

View File

@ -117,6 +117,11 @@ src_install() {
systemd_dotmpfilesd "${T}/baselayout-usr.conf"
fi
if use cros_host; then
# do not install networkd's resolv.conf symlink in SDK
rm "${D}"/usr/lib/tmpfiles.d/baselayout-resolv.conf || die
fi
# Fill in all other paths defined in tmpfiles configs
tmpfiles_create
@ -132,11 +137,6 @@ src_install() {
done
echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic || die
if ! use symlink-usr && ! use cros_host; then
# move resolv.conf to a writable location
dosym /run/resolv.conf /etc/resolv.conf
fi
if ! use symlink-usr ; then
# modprobe uses /lib instead of /usr/lib
mv "${D}"/usr/lib/modprobe.d "${D}"/lib/modprobe.d || die