diff options
| author | David P <megver83@parabola.nu> | 2021-02-02 00:59:26 -0300 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2021-02-21 18:46:09 -0300 |
| commit | 2f6f116d550a49d4239b0aecbaf4562ef922bab9 (patch) | |
| tree | d04e90eb95cc4ea952e045c5a0e5beb05ca5b497 /parabolaiso/initcpio/hooks/parabolaiso_pxe_common | |
| parent | f63664db672844dcfded8121535987d952a25267 (diff) | |
sync with archisov51
Imported changes:
f0ef2f3 (HEAD -> master, tag: v51, origin/master, origin/HEAD) Add changelog file
b588c52 build-host.sh: Style and syntax fixes
428bf47 Add build stage for continuous integration
2a24429 Add continuous integration scripts to linting
0723949 Add scripts for continuous integration
f9a7b20 configs/releng: move locale-gen from customize_airootfs.sh to a pacman hook
a46c740 config/releng: remove pacman hooks specific to ISO build process from airootfs after they run
767c095 Update my email in AUTHORS
dd51457 rm un-used set_image() dupe of check_image() in run_archiso.sh
23c5d52 add vorburger to AUTHORS.rst
0f20a11 Support setting more variables in profiledef.sh and rework the way overrides are applied
e7306a3 add cloud-init to baseline
744b8f1 make baseline have working ethernet networking, like releng
94dd194 add SSH server to baseline
221a921 use same airootfs_image_tool_options in baseline as in releng
4f4047a configs/releng: move the mirror uncommenting sed command from customize_airootfs.sh to a pacman hook
a2c8dd3 archiso_pxe_common: remove resolv.conf before copy
b30d1ca mkarchiso: add version information
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'parabolaiso/initcpio/hooks/parabolaiso_pxe_common')
| -rw-r--r-- | parabolaiso/initcpio/hooks/parabolaiso_pxe_common | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/parabolaiso/initcpio/hooks/parabolaiso_pxe_common b/parabolaiso/initcpio/hooks/parabolaiso_pxe_common index 035a3e9..4144983 100644 --- a/parabolaiso/initcpio/hooks/parabolaiso_pxe_common +++ b/parabolaiso/initcpio/hooks/parabolaiso_pxe_common @@ -72,6 +72,7 @@ run_latehook () { ip link set "${bootif_dev}" down fi elif [ "${copy_resolvconf}" != "n" ] && [ -f /etc/resolv.conf ]; then + rm -f /new_root/etc/resolv.conf cp /etc/resolv.conf /new_root/etc/resolv.conf fi fi |