forked from mirrored-repos/manjaro-tools
Compare commits
16 commits
master
...
stable-0.1
Author | SHA1 | Date | |
---|---|---|---|
|
d5b49f0f77 | ||
|
c06d2e160b | ||
|
c5facb498e | ||
|
aa976eda09 | ||
|
f9fdcad3a3 | ||
|
6c07c3286b | ||
|
0f896a2918 | ||
|
7b6fe03c3a | ||
|
9e36cc99c2 | ||
|
28db47e276 | ||
|
f3118097b9 | ||
|
109bf845a8 | ||
|
a2cd3f5c3f | ||
|
c122eef1f7 | ||
|
8a8bf8487a | ||
|
a48c76c6a2 |
4 changed files with 18 additions and 12 deletions
2
Makefile
2
Makefile
|
@ -1,4 +1,4 @@
|
||||||
Version=0.15.10
|
Version=0.15.12
|
||||||
|
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
SYSCONFDIR = /etc
|
SYSCONFDIR = /etc
|
||||||
|
|
|
@ -115,11 +115,12 @@ if ${build_locales}; then
|
||||||
printf '%s.UTF-8 UTF-8\n' en_US > "$working_dir/etc/locale.gen"
|
printf '%s.UTF-8 UTF-8\n' en_US > "$working_dir/etc/locale.gen"
|
||||||
printf 'LANG=%s.UTF-8\n' en_US > "$working_dir/etc/locale.conf"
|
printf 'LANG=%s.UTF-8\n' en_US > "$working_dir/etc/locale.conf"
|
||||||
printf 'LC_MESSAGES=C\n' >> "$working_dir/etc/locale.conf"
|
printf 'LC_MESSAGES=C\n' >> "$working_dir/etc/locale.conf"
|
||||||
|
|
||||||
|
chroot_args=(${pac_conf:+-C "$pac_conf"} ${makepkg_conf:+-M "$makepkg_conf"} \
|
||||||
|
${mirrors_conf:+-S "$mirrors_conf"} ${build_mirror:+-B "$build_mirror"} \
|
||||||
|
${cache_dir:+-c "$cache_dir"} ${keep_flag})
|
||||||
|
|
||||||
|
exec chroot-run \
|
||||||
|
${chroot_args[*]} \
|
||||||
|
"$working_dir" locale-gen
|
||||||
fi
|
fi
|
||||||
|
|
||||||
chroot_args=(${pac_conf:+-C "$pac_conf"} ${makepkg_conf:+-M "$makepkg_conf"} ${mirrors_conf:+-S "$mirrors_conf"} ${build_mirror:+-B "$build_mirror"} ${cache_dir:+-c "$cache_dir"} ${keep_flag})
|
|
||||||
|
|
||||||
exec chroot-run \
|
|
||||||
${chroot_args[*]} \
|
|
||||||
"$working_dir" locale-gen
|
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
|
@ -362,6 +366,9 @@ make_image_desktop() {
|
||||||
reset_pac_conf "${path}"
|
reset_pac_conf "${path}"
|
||||||
|
|
||||||
seed_snaps ${path}
|
seed_snaps ${path}
|
||||||
|
|
||||||
|
echo "Enable os-prober"
|
||||||
|
sed -i -e 's,.*GRUB_DISABLE_OS_PROBER=.*,GRUB_DISABLE_OS_PROBER=false,' "${path}/etc/default/grub"
|
||||||
|
|
||||||
umount_fs
|
umount_fs
|
||||||
clean_up_image "${path}"
|
clean_up_image "${path}"
|
||||||
|
@ -403,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)"
|
||||||
|
|
Loading…
Reference in a new issue