Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2020-12-05 12:01:07 +0200
committernl6720 <nl6720@gmail.com>2021-01-07 14:33:28 +0200
commit64091a1802a292e53d7dbb77f8198b550fc3cd35 (patch)
treeede7c7189ec8b72528edcc4b06e891cf8c19e310
parenta178ff44bc9cf00918bb23b1e5f0a0c2395f47e9 (diff)
Combine sed commands to reduce file writes
-rwxr-xr-xarchiso/mkarchiso13
1 files changed, 5 insertions, 8 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 4ab6bed..a75fc2a 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -242,17 +242,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
- pacman-conf --config "${pacman_conf}" | \
- sed '/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d' > "${work_dir}/pacman.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.conf"
+ # see `man 8 pacman` for further info
+ 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.conf"
}
# Prepare working directory and copy custom airootfs files (airootfs)