Do not copy /etc/resolv.conf or /etc/hostname if the host system doesn't have them

5 years ago · 3d3d3fe12d
parent 3dc32b81b0
commit 3d3d3fe12d
1 changed files with 10 additions and 2 deletions
--- a/12
+++ b/12
@ -1103,8 +1103,16 @@ sub setup {
    }

    # allow network access from within
-    copy("/etc/resolv.conf", "$options->{root}/etc/resolv.conf") or error "cannot copy /etc/resolv.conf: $!";
-    copy("/etc/hostname", "$options->{root}/etc/hostname") or error "cannot copy /etc/hostname: $!";
+    if (-e "/etc/resolv.conf") {
+	copy("/etc/resolv.conf", "$options->{root}/etc/resolv.conf") or error "cannot copy /etc/resolv.conf: $!";
+    } else {
+	warning("Host system does not have a /etc/resolv.conf to copy into the rootfs.")
+    }
+    if (-e "/etc/hostname") {
+	copy("/etc/hostname", "$options->{root}/etc/hostname") or error "cannot copy /etc/hostname: $!";
+    } else {
+	warning("Host system does not have a /etc/hostname to copy into the rootfs.")
+    }

    if ($options->{havemknod}) {
 	foreach my $file (@devfiles) {