diff options
author | David P <megver83@parabola.nu> | 2021-01-23 21:00:41 -0300 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2021-01-23 21:05:16 -0300 |
commit | f63664db672844dcfded8121535987d952a25267 (patch) | |
tree | e06dfbef2e4707704618cc2d3afc33810b0dc1db /parabolaiso | |
parent | c1247cad56aef820a18f51ea013c146027030b07 (diff) |
sync with archiso
imported changes:
d153b48 (HEAD -> master, origin/master, origin/HEAD) mkarchiso: fix typos
0ae5cd9 lint ALL (future) scripts/*.sh, not just run_archiso.sh
608d110 add -c => -cdrom cloud-init.iso support to run_archiso.sh
8830471 add cloud-init files to .gitignore (and loosen out/ and work/)
9553439 make run_archiso forward VM's port 22 to host 60022, for easy SSH testing
833cbd5 enable SSH server in releng profile
9b03e0b add cloud-init to releng
e556491 add VNC support to run_archiso.sh
64091a1 Combine sed commands to reduce file writes
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'parabolaiso')
-rwxr-xr-x | parabolaiso/mkparabolaiso | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index 97462ed..a3bb49b 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -264,17 +264,14 @@ _make_pacman_conf() { fi _msg_info "Copying custom pacman.conf to work directory..." - # take the profile pacman.conf and strip all settings that would break in chroot when using pacman -r - # see `man 8 pacman` for further info - setarch "${arch}" pacman-conf --config "${pacman_conf}" | \ - sed '/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d' > "${work_dir}/pacman_${arch}.conf" - _msg_info "Using pacman CacheDir: ${_cache_dirs}" + # take the profile pacman.conf and strip all settings that would break in chroot when using pacman -r # append CacheDir and HookDir to [options] section # HookDir is *always* set to the airootfs' override directory - sed "/\[options\]/a CacheDir = ${_cache_dirs} - /\[options\]/a HookDir = ${airootfs_dir}/etc/pacman.d/hooks/" \ - -i "${work_dir}/pacman_${arch}.conf" + # see `man 8 pacman` for further info + setarch "${arch}" pacman-conf --config "${pacman_conf}" | \ + sed "/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d;/\[options\]/a CacheDir = ${_cache_dirs} + /\[options\]/a HookDir = ${airootfs_dir}/etc/pacman.d/hooks/" > "${work_dir}/pacman_${arch}.conf" } # Prepare working directory and copy custom airootfs files (airootfs) |