mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-18 02:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(sys-apps/baselayout): Do not symlink resolv.conf to /run in SDK

Browse Source
This commit is contained in:
Michael Marineau 2014-03-04 10:49:35 -08:00
parent 38e59ff8c4
commit 2ee19425ca
2 changed files with 5 additions and 3 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.0.0-r5.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r6.ebuild vendored
View File

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

@ -132,13 +132,15 @@ src_install() {
done done
echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic || die 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 if ! use symlink-usr ; then
# modprobe uses /lib instead of /usr/lib # modprobe uses /lib instead of /usr/lib
mv "${D}"/usr/lib/modprobe.d "${D}"/lib/modprobe.d || die mv "${D}"/usr/lib/modprobe.d "${D}"/lib/modprobe.d || die
# move resolv.conf to a writable location
dosym /run/resolv.conf /etc/resolv.conf
# core is UID:GID 1000:1000 in old images # core is UID:GID 1000:1000 in old images
sed -i -e 's/^core:x:500:500:/core:x:1000:1000:/' \ sed -i -e 's/^core:x:500:500:/core:x:1000:1000:/' \
"${D}"/usr/share/baselayout/passwd || die "${D}"/usr/share/baselayout/passwd || die