root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[merge] changes from master

Browse source
This commit is contained in:
Philip Müller 2021-07-01 09:28:49 +02:00
parent c06d2e160b
commit d5b49f0f77
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/util-iso-boot.sh
View file

@ -39,8 +39,8 @@ prepare_initramfs(){
prepare_boot_extras(){ prepare_boot_extras(){
cp $1/boot/amd-ucode.img $2/amd_ucode.img cp $1/boot/amd-ucode.img $2/amd_ucode.img
cp $1/boot/intel-ucode.img $2/intel_ucode.img cp $1/boot/intel-ucode.img $2/intel_ucode.img
cp $1/usr/share/licenses/amd-ucode/LICENSE $2/amd_ucode.LICENSE cp $1/usr/share/licenses/amd-ucode/LIC* $2/amd_ucode.LICENSE
cp $1/usr/share/licenses/intel-ucode/LICENSE $2/intel_ucode.LICENSE cp $1/usr/share/licenses/intel-ucode/LIC* $2/intel_ucode.LICENSE
cp $1/boot/memtest86+/memtest.bin $2/memtest cp $1/boot/memtest86+/memtest.bin $2/memtest
cp $1/usr/share/licenses/common/GPL2/license.txt $2/memtest.COPYING cp $1/usr/share/licenses/common/GPL2/license.txt $2/memtest.COPYING
} }

6
lib/util-iso.sh
View file

@ -198,6 +198,10 @@ make_iso() {
touch "${iso_root}/.miso" touch "${iso_root}/.miso"
for sfs_dir in $(find "${work_dir}" -maxdepth 1 -type d); do for sfs_dir in $(find "${work_dir}" -maxdepth 1 -type d); do
if [[ "${sfs_dir}" != "${work_dir}" ]]; then if [[ "${sfs_dir}" != "${work_dir}" ]]; then
if [[ -e "${sfs_dir}"/etc/pacman.d/gnupg ]]; then
msg2 "Removing '/etc/pacman.d/gnupg' folder from ${sfs_dir}"
rm -rf "${sfs_dir}"/etc/pacman.d/gnupg
fi
make_sfs "${sfs_dir}" make_sfs "${sfs_dir}"
fi fi
done done
@ -406,8 +410,6 @@ make_image_live() {
umount_fs umount_fs
# Clean up GnuPG keys
rm -rf "${path}/etc/pacman.d/gnupg"
clean_up_image "${path}" clean_up_image "${path}"
: > ${work_dir}/build.${FUNCNAME} : > ${work_dir}/build.${FUNCNAME}
msg "Done [Live installation] (livefs)" msg "Done [Live installation] (livefs)"