From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 4/6] meta: cache_deb_src: Account for the case that resolv.conf is a non-existent link
Date: Mon, 14 Dec 2020 08:11:25 +0100 [thread overview]
Message-ID: <4b141fb9b093959f1e20cb315eece734480b5963.1607929886.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1607929886.git.jan.kiszka@siemens.com>
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 --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
}
--
2.26.2
next prev parent reply other threads:[~2020-12-14 7:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 7:11 [PATCH 0/6] Add support for Ubuntu Jan Kiszka
2020-12-14 7:11 ` [PATCH 1/6] meta: image: Account for Ubuntu differences in do_copy_boot_files Jan Kiszka
2020-12-14 12:16 ` Henning Schild
2020-12-14 12:27 ` Jan Kiszka
2020-12-14 12:36 ` Henning Schild
2020-12-14 16:39 ` Jan Kiszka
2020-12-14 16:40 ` Henning Schild
2020-12-15 9:22 ` Jan Kiszka
2020-12-14 7:11 ` [PATCH 2/6] meta/isar-bootstrap: allow passing a SCRIPT to debootstrap Jan Kiszka
2020-12-14 7:11 ` [PATCH 3/6] wic: bootimg-efi-isar: Add support for Ubuntu Jan Kiszka
2020-12-14 12:13 ` Henning Schild
2020-12-14 12:28 ` Jan Kiszka
2020-12-14 12:33 ` Henning Schild
2020-12-14 7:11 ` Jan Kiszka [this message]
2020-12-14 7:11 ` [PATCH 5/6] meta-isar: Add new distro ubuntu with suite "focal" Jan Kiszka
2020-12-14 7:11 ` [PATCH 6/6] meta-isar: linux-mainline: Adjust cfg fragment test to arm64 defconfig Jan Kiszka
2020-12-14 12:06 ` [PATCH 0/6] Add support for Ubuntu Henning Schild
2020-12-14 12:26 ` Jan Kiszka
2021-01-18 16:15 ` Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4b141fb9b093959f1e20cb315eece734480b5963.1607929886.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox