summaryrefslogtreecommitdiff
path: root/mkarchroot
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2007-11-28 22:18:26 -0600
committerAaron Griffin <aaronmgriffin@gmail.com>2007-11-28 22:18:26 -0600
commitbc8a791ad64e34914ccce1559ec86ddf84db2427 (patch)
tree3ca4e907c4ac517108d7ca94099a1b43c95de1a2 /mkarchroot
parent4a829ff1f769d785a07fb263f528166ad23a19a8 (diff)
Copy resolv.conf each time just like mtab
Resolv.conf changes, like mtab, so we can't just trust it to copy on build only Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
Diffstat (limited to 'mkarchroot')
-rwxr-xr-xmkarchroot6
1 files changed, 3 insertions, 3 deletions
diff --git a/mkarchroot b/mkarchroot
index bc81872..84309a8 100755
--- a/mkarchroot
+++ b/mkarchroot
@@ -84,6 +84,9 @@ chroot_mount ()
echo "copying mtab : /etc/mtab"
cp /etc/mtab "${working_dir}/etc/mtab"
+ echo "copying resolv.conf : /etc/resolv.conf"
+ cp /etc/resolv.conf "${working_dir}/etc/resolv.conf"
+
trap 'chroot_umount' 0 1 2 15
}
@@ -164,9 +167,6 @@ else
cp ${makepkg_conf} ${working_dir}/etc/makepkg.conf
fi
- echo "copying resolv.conf : /etc/resolv.conf"
- cp /etc/resolv.conf "${working_dir}/etc/resolv.conf"
-
echo "generating default locales"
cp /etc/locale.gen "${working_dir}/etc/locale.gen"
chroot "${working_dir}" locale-gen