diff mbox series

[4/6] meta: cache_deb_src: Account for the case that resolv.conf is a non-existent link

Message ID 4b141fb9b093959f1e20cb315eece734480b5963.1607929886.git.jan.kiszka@siemens.com
State Accepted, archived
Headers show
Series Add support for Ubuntu | expand

Commit Message

Jan Kiszka Dec. 13, 2020, 9:11 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

This is true if systemd-resolve is used, like on Ubuntu.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/rootfs.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index efed0f65..f9151c5b 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -186,7 +186,8 @@  python do_rootfs_install() {
 addtask rootfs_install before do_rootfs_postprocess after do_unpack
 
 cache_deb_src() {
-    if [ -e "${ROOTFSDIR}"/etc/resolv.conf ]; then
+    if [ -e "${ROOTFSDIR}"/etc/resolv.conf ] ||
+       [ -h "${ROOTFSDIR}"/etc/resolv.conf ]; then
         sudo mv "${ROOTFSDIR}"/etc/resolv.conf "${ROOTFSDIR}"/etc/resolv.conf.isar
     fi
     rootfs_install_resolvconf
@@ -199,7 +200,8 @@  cache_deb_src() {
     debsrc_download ${ROOTFSDIR} ${ROOTFS_DISTRO}
 
     sudo rm -f "${ROOTFSDIR}"/etc/resolv.conf
-    if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then
+    if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ] ||
+       [ -h "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then
         sudo mv "${ROOTFSDIR}"/etc/resolv.conf.isar "${ROOTFSDIR}"/etc/resolv.conf
     fi
 }