Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Combine sed commands to reduce file writes

Browse Source
This commit is contained in:
nl6720 2020-12-05 12:01:07 +02:00
parent a178ff44bc
commit 64091a1802
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
archiso/mkarchiso
View File

@ -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)