[util] variable rename for iso libs; small fixes
This commit is contained in:
udeved
parent
38c40bd1c2
commit
95e748778c
6 changed files with 125 additions and 141 deletions
|
|
@ -36,8 +36,8 @@ copy_efi_shells(){
|
|||
gen_boot_image(){
|
||||
chroot-run $1 \
|
||||
/usr/bin/mkinitcpio -k $(uname -r) \
|
||||
-c /etc/mkinitcpio-${dist_iso}.conf \
|
||||
-g /boot/${img_name}.img
|
||||
-c /etc/mkinitcpio-${iso_name}.conf \
|
||||
-g /boot/${iso_name}.img
|
||||
}
|
||||
|
||||
copy_efi_loaders(){
|
||||
|
|
@ -49,8 +49,8 @@ copy_efi_loaders(){
|
|||
|
||||
copy_boot_images(){
|
||||
msg2 "copying boot images ..."
|
||||
cp $1/x86_64/${dist_iso} $2/${dist_iso}.efi
|
||||
cp $1/x86_64/${img_name}.img $2/${img_name}.img
|
||||
cp $1/x86_64/${iso_name} $2/${iso_name}.efi
|
||||
cp $1/x86_64/${iso_name}.img $2/${iso_name}.img
|
||||
cp $1/intel_ucode.img $2/intel_ucode.img
|
||||
}
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ copy_initcpio(){
|
|||
msg2 "copying initcpio ..."
|
||||
cp /usr/lib/initcpio/hooks/miso* $1/usr/lib/initcpio/hooks
|
||||
cp /usr/lib/initcpio/install/miso* $1/usr/lib/initcpio/install
|
||||
cp mkinitcpio.conf $1/etc/mkinitcpio-${dist_iso}.conf
|
||||
cp mkinitcpio.conf $1/etc/mkinitcpio-${iso_name}.conf
|
||||
}
|
||||
|
||||
write_loader_conf(){
|
||||
|
|
@ -66,7 +66,7 @@ write_loader_conf(){
|
|||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
echo 'timeout 3' > ${conf}
|
||||
echo "default ${dist_iso}-${arch}" >> ${conf}
|
||||
echo "default ${iso_name}-${arch}" >> ${conf}
|
||||
}
|
||||
|
||||
write_efi_shellv1_conf(){
|
||||
|
|
@ -86,73 +86,73 @@ write_efi_shellv2_conf(){
|
|||
}
|
||||
|
||||
write_dvd_conf(){
|
||||
local fn=${dist_iso}-${arch}.conf
|
||||
local fn=${iso_name}-${arch}.conf
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
echo "title Manjaro Linux ${arch} UEFI DVD (default)" > ${conf}
|
||||
echo "linux /EFI/miso/${dist_iso}.efi" >> ${conf}
|
||||
echo "title ${dist_name} Linux ${arch} UEFI DVD (default)" > ${conf}
|
||||
echo "linux /EFI/miso/${iso_name}.efi" >> ${conf}
|
||||
echo "initrd /EFI/miso/intel_ucode.img" >> ${conf}
|
||||
echo "initrd /EFI/miso/${img_name}.img" >> ${conf}
|
||||
echo "options misobasedir=${install_dir} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free" >> ${conf}
|
||||
echo "initrd /EFI/miso/${iso_name}.img" >> ${conf}
|
||||
echo "options misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free" >> ${conf}
|
||||
}
|
||||
|
||||
write_dvd_nonfree_conf(){
|
||||
local fn=${dist_iso}-${arch}-nonfree.conf
|
||||
local fn=${iso_name}-${arch}-nonfree.conf
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
echo "title Manjaro Linux ${arch} UEFI DVD (nonfree)" > ${conf}
|
||||
echo "linux /EFI/miso/${dist_iso}.efi" >> ${conf}
|
||||
echo "title ${dist_name} Linux ${arch} UEFI DVD (nonfree)" > ${conf}
|
||||
echo "linux /EFI/miso/${iso_name}.efi" >> ${conf}
|
||||
echo "initrd /EFI/miso/intel_ucode.img" >> ${conf}
|
||||
echo "initrd /EFI/miso/${img_name}.img" >> ${conf}
|
||||
echo "options misobasedir=${install_dir} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=nonfree nonfree=yes" >> ${conf}
|
||||
echo "initrd /EFI/miso/${iso_name}.img" >> ${conf}
|
||||
echo "options misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=nonfree nonfree=yes" >> ${conf}
|
||||
}
|
||||
|
||||
write_usb_conf(){
|
||||
local fn=${dist_iso}-${arch}.conf
|
||||
local fn=${iso_name}-${arch}.conf
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
echo "title Manjaro Linux ${arch} UEFI USB (default)" > ${conf}
|
||||
echo "linux /${install_dir}/boot/${arch}/${dist_iso}" >> ${conf}
|
||||
echo "initrd /${install_dir}/boot/intel_ucode.img" >> ${conf}
|
||||
echo "initrd /${install_dir}/boot/${arch}/${img_name}.img" >> ${conf}
|
||||
echo "options misobasedir=${install_dir} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free" >> ${conf}
|
||||
echo "title ${dist_name} Linux ${arch} UEFI USB (default)" > ${conf}
|
||||
echo "linux /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
|
||||
echo "initrd /${iso_name}/boot/intel_ucode.img" >> ${conf}
|
||||
echo "initrd /${iso_name}/boot/${arch}/${iso_name}.img" >> ${conf}
|
||||
echo "options misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free" >> ${conf}
|
||||
}
|
||||
|
||||
write_usb_nonfree_conf(){
|
||||
local fn=${dist_iso}-${arch}-nonfree.conf
|
||||
local fn=${iso_name}-${arch}-nonfree.conf
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
echo "title Manjaro Linux ${arch} UEFI USB (nonfree)" > ${conf}
|
||||
echo "linux /${install_dir}/boot/${arch}/${dist_iso}" >> ${conf}
|
||||
echo "initrd /${install_dir}/boot/intel_ucode.img" >> ${conf}
|
||||
echo "initrd /${install_dir}/boot/${arch}/${img_name}.img" >> ${conf}
|
||||
echo "options misobasedir=${install_dir} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=nonfree nonfree=yes" >> ${conf}
|
||||
echo "title ${dist_name} Linux ${arch} UEFI USB (nonfree)" > ${conf}
|
||||
echo "linux /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
|
||||
echo "initrd /${iso_name}/boot/intel_ucode.img" >> ${conf}
|
||||
echo "initrd /${iso_name}/boot/${arch}/${iso_name}.img" >> ${conf}
|
||||
echo "options misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=nonfree nonfree=yes" >> ${conf}
|
||||
}
|
||||
|
||||
copy_isolinux_bin(){
|
||||
if [[ -e $1/usr/lib/syslinux/bios ]]; then
|
||||
msg2 "copying isolinux bios binaries ..."
|
||||
cp $1/usr/lib/syslinux/bios/isolinux.bin $2/
|
||||
cp $1/usr/lib/syslinux/bios/isohdpfx.bin $2/
|
||||
cp $1/usr/lib/syslinux/bios/ldlinux.c32 $2/
|
||||
cp $1/usr/lib/syslinux/bios/gfxboot.c32 $2/
|
||||
cp $1/usr/lib/syslinux/bios/whichsys.c32 $2/
|
||||
cp $1/usr/lib/syslinux/bios/mboot.c32 $2/
|
||||
cp $1/usr/lib/syslinux/bios/hdt.c32 $2/
|
||||
cp $1/usr/lib/syslinux/bios/chain.c32 $2/
|
||||
cp $1/usr/lib/syslinux/bios/libcom32.c32 $2/
|
||||
cp $1/usr/lib/syslinux/bios/libmenu.c32 $2/
|
||||
cp $1/usr/lib/syslinux/bios/libutil.c32 $2/
|
||||
cp $1/usr/lib/syslinux/bios/libgpl.c32 $2/
|
||||
cp $1/usr/lib/syslinux/bios/isolinux.bin $2
|
||||
cp $1/usr/lib/syslinux/bios/isohdpfx.bin $2
|
||||
cp $1/usr/lib/syslinux/bios/ldlinux.c32 $2
|
||||
cp $1/usr/lib/syslinux/bios/gfxboot.c32 $2
|
||||
cp $1/usr/lib/syslinux/bios/whichsys.c32 $2
|
||||
cp $1/usr/lib/syslinux/bios/mboot.c32 $2
|
||||
cp $1/usr/lib/syslinux/bios/hdt.c32 $2
|
||||
cp $1/usr/lib/syslinux/bios/chain.c32 $2
|
||||
cp $1/usr/lib/syslinux/bios/libcom32.c32 $2
|
||||
cp $1/usr/lib/syslinux/bios/libmenu.c32 $2
|
||||
cp $1/usr/lib/syslinux/bios/libutil.c32 $2
|
||||
cp $1/usr/lib/syslinux/bios/libgpl.c32 $2
|
||||
else
|
||||
msg2 "copying isolinux binaries ..."
|
||||
cp $1/usr/lib/syslinux/isolinux.bin $2/
|
||||
cp $1/usr/lib/syslinux/isohdpfx.bin $2/
|
||||
cp $1/usr/lib/syslinux/gfxboot.c32 $2/
|
||||
cp $1/usr/lib/syslinux/whichsys.c32 $2/
|
||||
cp $1/usr/lib/syslinux/mboot.c32 $2/
|
||||
cp $1/usr/lib/syslinux/hdt.c32 $2/
|
||||
cp $1/usr/lib/syslinux/chain.c32 $2/
|
||||
cp $1/usr/lib/syslinux/isolinux.bin $2
|
||||
cp $1/usr/lib/syslinux/isohdpfx.bin $2
|
||||
cp $1/usr/lib/syslinux/gfxboot.c32 $2
|
||||
cp $1/usr/lib/syslinux/whichsys.c32 $2
|
||||
cp $1/usr/lib/syslinux/mboot.c32 $2
|
||||
cp $1/usr/lib/syslinux/hdt.c32 $2
|
||||
cp $1/usr/lib/syslinux/chain.c32 $2
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -168,12 +168,12 @@ write_isolinux_cfg(){
|
|||
echo "timeout 200" >> ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo "label start" >> ${conf}
|
||||
echo " kernel /${install_dir}/boot/${arch}/${dist_iso}" >> ${conf}
|
||||
echo " append initrd=/${install_dir}/boot/intel_ucode.img,/${install_dir}/boot/${arch}/${img_name}.img misobasedir=${install_dir} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free quiet splash showopts" >> ${conf}
|
||||
echo " kernel /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
|
||||
echo " append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free quiet splash showopts" >> ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo "label nonfree" >> ${conf}
|
||||
echo " kernel /${install_dir}/boot/${arch}/${dist_iso}" >> ${conf}
|
||||
echo " append initrd=/${install_dir}/boot/intel_ucode.img,/${install_dir}/boot/${arch}/${img_name}.img misobasedir=${install_dir} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree quiet splash showopts" >> ${conf}
|
||||
echo " kernel /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
|
||||
echo " append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree quiet splash showopts" >> ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo "label harddisk" >> ${conf}
|
||||
echo " com32 whichsys.c32" >> ${conf}
|
||||
|
|
@ -190,13 +190,13 @@ write_isolinux_msg(){
|
|||
local fn=isolinux.msg
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
echo "Welcome to ${img_name} Linux!" > ${conf}
|
||||
echo "Welcome to ${dist_name} Linux!" > ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo "To start the system enter 'start' and press <return>" >> ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo "Available boot options:" >> ${conf}
|
||||
echo "start - Start ${img_name} Live System" >> ${conf}
|
||||
echo "start - Start ${dist_name} Live System" >> ${conf}
|
||||
echo "nonfree - Start with proprietary drivers" >> ${conf}
|
||||
echo "harddisk - Boot from local hard disk" >> ${conf}
|
||||
echo "hdt - Run Hardware Detection Tool" >> ${conf}
|
||||
|
|
@ -207,16 +207,14 @@ update_isolinux_cfg(){
|
|||
local fn=isolinux.cfg
|
||||
msg2 "updating ${fn} ..."
|
||||
sed -i "s|%MISO_LABEL%|${iso_label}|g;
|
||||
s|%INSTALL_DIR%|${install_dir}|g;
|
||||
s|%IMG_NAME%|${img_name}|g;
|
||||
s|%DIST_ISO%|${dist_iso}|g;
|
||||
s|%ISO_NAME%|${iso_name}|g;
|
||||
s|%ARCH%|${arch}|g" $1/${fn}
|
||||
}
|
||||
|
||||
update_isolinux_msg(){
|
||||
local fn=isolinux.msg
|
||||
msg2 "updating ${fn} ..."
|
||||
sed -i "s|%IMG_NAME%|${img_name}|g" $1/${fn}
|
||||
sed -i "s|%DIST_NAME%|${dist_name}|g" $1/${fn}
|
||||
}
|
||||
|
||||
write_isomounts(){
|
||||
|
|
|
|||
|
|
@ -25,15 +25,15 @@ write_calamares_finished_conf(){
|
|||
}
|
||||
|
||||
write_calamares_bootloader_conf(){
|
||||
source "$1/etc/mkinitcpio.d/${dist_kernel}.preset"
|
||||
source "$1/etc/mkinitcpio.d/${kernel}.preset"
|
||||
local conf="$1/etc/calamares/modules/bootloader.conf"
|
||||
echo '---' > "$conf"
|
||||
echo "efiBootLoader: \"${efi_boot_loader}\"" >> "$conf"
|
||||
echo "kernel: \"$(echo ${ALL_kver} | sed s'|/boot||')\"" >> "$conf"
|
||||
echo "img: \"$(echo ${default_image} | sed s'|/boot||')\"" >> "$conf"
|
||||
echo "fallback: \"$(echo ${fallback_image} | sed s'|/boot||')\"" >> "$conf"
|
||||
echo "kernelLine: \", with ${dist_kernel}\"" >> "$conf"
|
||||
echo "fallbackKernelLine: \", with ${dist_kernel} (fallback initramfs)\"" >> "$conf"
|
||||
echo "kernelLine: \", with ${kernel}\"" >> "$conf"
|
||||
echo "fallbackKernelLine: \", with ${kernel} (fallback initramfs)\"" >> "$conf"
|
||||
echo 'timeout: "10"' >> "$conf"
|
||||
echo 'grubInstall: "grub-install"' >> "$conf"
|
||||
echo 'grubMkconfig: "grub-mkconfig"' >> "$conf"
|
||||
|
|
@ -81,17 +81,17 @@ write_calamares_dm_conf(){
|
|||
write_calamares_initcpio_conf(){
|
||||
local conf="$1/etc/calamares/modules/initcpio.conf"
|
||||
echo "---" > "$conf"
|
||||
echo "kernel: ${dist_kernel}" >> "$conf"
|
||||
echo "kernel: ${kernel}" >> "$conf"
|
||||
}
|
||||
|
||||
write_calamares_unpack_conf(){
|
||||
local conf="$1/etc/calamares/modules/unpackfs.conf"
|
||||
echo "---" > "$conf"
|
||||
echo "unpack:" >> "$conf"
|
||||
echo " - source: \"/bootmnt/${install_dir}/${arch}/root-image.sqfs\"" >> "$conf"
|
||||
echo " - source: \"/bootmnt/${iso_name}/${arch}/root-image.sqfs\"" >> "$conf"
|
||||
echo " sourcefs: \"squashfs\"" >> "$conf"
|
||||
echo " destination: \"\"" >> "$conf"
|
||||
echo " - source: \"/bootmnt/${install_dir}/${arch}/${custom}-image.sqfs\"" >> "$conf"
|
||||
echo " - source: \"/bootmnt/${iso_name}/${arch}/${custom}-image.sqfs\"" >> "$conf"
|
||||
echo " sourcefs: \"squashfs\"" >> "$conf"
|
||||
echo " destination: \"\"" >> "$conf"
|
||||
}
|
||||
|
|
@ -136,10 +136,10 @@ configure_thus(){
|
|||
if [[ -f $1/usr/bin/thus ]];then
|
||||
msg2 "Configuring Thus ..."
|
||||
local conf="$1/etc/thus.conf"
|
||||
sed -i "s|_version_|$iso_version|g" $conf
|
||||
sed -i "s|_kernel_|$dist_kernel|g" $conf
|
||||
sed -i "s|_root-image_|/bootmnt/${install_dir}/${arch}/root-image.sqfs|g" $conf
|
||||
sed -i "s|_desktop-image_|/bootmnt/${install_dir}/${arch}/${custom}-image.sqfs|g" $conf
|
||||
sed -i "s|_version_|$dist_release|g" $conf
|
||||
sed -i "s|_kernel_|$kernel|g" $conf
|
||||
sed -i "s|_root-image_|/bootmnt/${iso_name}/${arch}/root-image.sqfs|g" $conf
|
||||
sed -i "s|_desktop-image_|/bootmnt/${iso_name}/${arch}/${custom}-image.sqfs|g" $conf
|
||||
echo "QT_STYLE_OVERRIDE=gtk" >> $1/etc/environment
|
||||
mkdir -p $1/home/${username}/Desktop
|
||||
cp $1/usr/share/applications/thus.desktop $1/home/${username}/Desktop/thus.desktop
|
||||
|
|
|
|||
|
|
@ -72,8 +72,8 @@ configure_services_live(){
|
|||
configure_lsb(){
|
||||
[[ -f $1/boot/grub/grub.cfg ]] && rm $1/boot/grub/grub.cfg
|
||||
if [ -e $1/etc/lsb-release ] ; then
|
||||
sed -i -e "s/^.*DISTRIB_RELEASE.*/DISTRIB_RELEASE=${iso_version}/" $1/etc/lsb-release
|
||||
sed -i -e "s/^.*DISTRIB_CODENAME.*/DISTRIB_CODENAME=${code_name}/" $1/etc/lsb-release
|
||||
sed -i -e "s/^.*DISTRIB_RELEASE.*/DISTRIB_RELEASE=${dist_release}/" $1/etc/lsb-release
|
||||
sed -i -e "s/^.*DISTRIB_CODENAME.*/DISTRIB_CODENAME=${dist_codename}/" $1/etc/lsb-release
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -90,14 +90,8 @@ write_profile_conf_entries(){
|
|||
echo '# custom image name' >> ${conf}
|
||||
echo "custom=${custom}" >> ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo '# install_dir' >> ${conf}
|
||||
echo "install_dir=${install_dir}" >> ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo '# dist_iso' >> ${conf}
|
||||
echo "dist_iso=${dist_iso}" >> ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo '# dist_kernel_ver' >> ${conf}
|
||||
echo "dist_kernel_ver=${dist_kernel_ver}" >> ${conf}
|
||||
echo '# iso_name' >> ${conf}
|
||||
echo "iso_name=${iso_name}" >> ${conf}
|
||||
}
|
||||
|
||||
copy_livecd_helpers(){
|
||||
|
|
@ -198,11 +192,11 @@ make_iso() {
|
|||
# $1: file
|
||||
make_checksum(){
|
||||
cd ${cache_dir_iso}
|
||||
msg "Creating [${checksum_mode}sum] ..."
|
||||
local cs=$(${checksum_mode}sum $1)
|
||||
msg2 "${checksum_mode}sum: ${cs}"
|
||||
echo "${cs}" > $1.${checksum_mode}
|
||||
msg "Done [${checksum_mode}sum]"
|
||||
msg "Creating [${iso_checksum}sum] ..."
|
||||
local cs=$(${iso_checksum}sum $1)
|
||||
msg2 "${iso_checksum}sum: ${cs}"
|
||||
echo "${cs}" > $1.${iso_checksum}
|
||||
msg "Done [${iso_checksum}sum]"
|
||||
cd ..
|
||||
}
|
||||
|
||||
|
|
@ -269,7 +263,7 @@ make_image_custom() {
|
|||
aufs_mount_root_image "${path}"
|
||||
mkiso ${create_args[*]} -i "${custom}-image" -p "${packages}" create "${work_dir}" || mkiso_error_handler
|
||||
pacman -Qr "${path}" > "${path}/${custom}-image-pkgs.txt"
|
||||
cp "${path}/${custom}-image-pkgs.txt" ${cache_dir_iso}/${img_name}-${custom}-${iso_version}-${arch}-pkgs.txt
|
||||
cp "${path}/${custom}-image-pkgs.txt" ${cache_dir_iso}/${iso_name}-${custom}-${dist_release}-${arch}-pkgs.txt
|
||||
[[ -d ${custom}-overlay ]] && copy_overlay_custom
|
||||
configure_custom_image "${path}"
|
||||
umount_image_handler
|
||||
|
|
@ -371,14 +365,13 @@ make_image_lng() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Prepare ${install_dir}/boot/
|
||||
make_image_boot() {
|
||||
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
|
||||
msg "Prepare [${install_dir}/boot]"
|
||||
local path_iso="${work_dir}/iso/${install_dir}/boot"
|
||||
msg "Prepare [${iso_name}/boot]"
|
||||
local path_iso="${work_dir}/iso/${iso_name}/boot"
|
||||
mkdir -p ${path_iso}/${arch}
|
||||
cp ${work_dir}/root-image/boot/memtest86+/memtest.bin ${path_iso}/${arch}/memtest
|
||||
cp ${work_dir}/root-image/boot/vmlinuz* ${path_iso}/${arch}/${dist_iso}
|
||||
cp ${work_dir}/root-image/boot/vmlinuz* ${path_iso}/${arch}/${iso_name}
|
||||
local path="${work_dir}/boot-image"
|
||||
mkdir -p ${path}
|
||||
umount_image_handler
|
||||
|
|
@ -390,20 +383,20 @@ make_image_boot() {
|
|||
fi
|
||||
copy_initcpio "${path}"
|
||||
gen_boot_image "${path}"
|
||||
mv ${path}/boot/${img_name}.img ${path_iso}/${arch}/${img_name}.img
|
||||
mv ${path}/boot/${iso_name}.img ${path_iso}/${arch}/${iso_name}.img
|
||||
cp ${path}/boot/intel-ucode.img ${path_iso}/intel_ucode.img
|
||||
cp ${path}/usr/share/licenses/intel-ucode/LICENSE ${path_iso}/intel_ucode.LICENSE
|
||||
umount_image_handler
|
||||
rm -R ${path}
|
||||
: > ${work_dir}/build.${FUNCNAME}
|
||||
msg "Done [${install_dir}/boot]"
|
||||
msg "Done [${iso_name}/boot]"
|
||||
fi
|
||||
}
|
||||
|
||||
# Prepare /EFI
|
||||
make_efi() {
|
||||
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
|
||||
msg "Prepare [${install_dir}/boot/EFI]"
|
||||
msg "Prepare [${iso_name}/boot/EFI]"
|
||||
local path_iso="${work_dir}/iso"
|
||||
local path_efi="${path_iso}/EFI"
|
||||
mkdir -p ${path_efi}/boot
|
||||
|
|
@ -416,23 +409,23 @@ make_efi() {
|
|||
write_usb_nonfree_conf "${path_iso}/loader/entries"
|
||||
copy_efi_shells "${path_efi}"
|
||||
: > ${work_dir}/build.${FUNCNAME}
|
||||
msg "Done [${install_dir}/boot/EFI]"
|
||||
msg "Done [${iso_name}/boot/EFI]"
|
||||
fi
|
||||
}
|
||||
|
||||
# Prepare kernel.img::/EFI for "El Torito" EFI boot mode
|
||||
make_efiboot() {
|
||||
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
|
||||
msg "Prepare [${install_dir}/iso/EFI]"
|
||||
msg "Prepare [${iso_name}/iso/EFI]"
|
||||
local path_iso="${work_dir}/iso"
|
||||
mkdir -p ${path_iso}/EFI/miso
|
||||
truncate -s 31M ${path_iso}/EFI/miso/${img_name}.img
|
||||
mkfs.vfat -n MISO_EFI ${path_iso}/EFI/miso/${img_name}.img
|
||||
truncate -s 31M ${path_iso}/EFI/miso/${iso_name}.img
|
||||
mkfs.vfat -n MISO_EFI ${path_iso}/EFI/miso/${iso_name}.img
|
||||
mkdir -p ${work_dir}/efiboot
|
||||
mount ${path_iso}/EFI/miso/${img_name}.img ${work_dir}/efiboot
|
||||
mount ${path_iso}/EFI/miso/${iso_name}.img ${work_dir}/efiboot
|
||||
local path_efi="${work_dir}/efiboot/EFI"
|
||||
mkdir -p ${path_efi}/miso
|
||||
copy_boot_images "${path_iso}/${install_dir}/boot" "${path_efi}/miso"
|
||||
copy_boot_images "${path_iso}/${iso_name}/boot" "${path_efi}/miso"
|
||||
mkdir -p ${path_efi}/boot
|
||||
copy_efi_loaders "${work_dir}/root-image" "${path_efi}/boot"
|
||||
local efi_loader=${work_dir}/efiboot/loader
|
||||
|
|
@ -445,14 +438,14 @@ make_efiboot() {
|
|||
copy_efi_shells "${path_efi}"
|
||||
umount ${work_dir}/efiboot
|
||||
: > ${work_dir}/build.${FUNCNAME}
|
||||
msg "Done [${install_dir}/iso/EFI]"
|
||||
msg "Done [${iso_name}/iso/EFI]"
|
||||
fi
|
||||
}
|
||||
|
||||
# Prepare /isolinux
|
||||
make_isolinux() {
|
||||
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
|
||||
msg "Prepare [${install_dir}/iso/isolinux]"
|
||||
msg "Prepare [${iso_name}/iso/isolinux]"
|
||||
local path=${work_dir}/iso/isolinux
|
||||
mkdir -p ${path}
|
||||
cp -a --no-preserve=ownership isolinux/* ${path}
|
||||
|
|
@ -466,14 +459,14 @@ make_isolinux() {
|
|||
fi
|
||||
copy_isolinux_bin "${work_dir}/root-image" "${path}"
|
||||
: > ${work_dir}/build.${FUNCNAME}
|
||||
msg "Done [${install_dir}/iso/isolinux]"
|
||||
msg "Done [${iso_name}/iso/isolinux]"
|
||||
fi
|
||||
}
|
||||
|
||||
make_isomounts() {
|
||||
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
|
||||
msg "Creating [isomounts]"
|
||||
write_isomounts "${work_dir}/iso/${install_dir}/isomounts"
|
||||
write_isomounts "${work_dir}/iso/${iso_name}/isomounts"
|
||||
: > ${work_dir}/build.${FUNCNAME}
|
||||
msg "Done creating [isomounts]"
|
||||
fi
|
||||
|
|
@ -483,20 +476,20 @@ make_isomounts() {
|
|||
load_pkgs(){
|
||||
msg3 "Loading Packages: [$1] ..."
|
||||
if [[ "${arch}" == "i686" ]]; then
|
||||
packages=$(sed "s|#.*||g" "$1" | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>x86_64.*||g" | sed "s|>i686||g" | sed "s|KERNEL|$dist_kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
|
||||
packages=$(sed "s|#.*||g" "$1" | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>x86_64.*||g" | sed "s|>i686||g" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
|
||||
elif [[ "${arch}" == "x86_64" ]]; then
|
||||
packages=$(sed "s|#.*||g" "$1" | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>i686.*||g" | sed "s|>x86_64||g" | sed "s|KERNEL|$dist_kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
|
||||
packages=$(sed "s|#.*||g" "$1" | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>i686.*||g" | sed "s|>x86_64||g" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
|
||||
fi
|
||||
}
|
||||
|
||||
load_pkgs_xorg(){
|
||||
msg3 "Loading Packages: [Packages-Xorg] ..."
|
||||
if [[ "${arch}" == "i686" ]]; then
|
||||
packages_xorg=$(sed "s|#.*||g" Packages-Xorg | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>cleanup.*||g" | sed "s|>x86_64.*||g" | sed "s|>i686||g" | sed "s|>free_x64.*||g" | sed "s|>free_uni||g" | sed "s|>nonfree_x64.*||g" | sed "s|>nonfree_uni||g" | sed "s|KERNEL|$dist_kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
|
||||
packages_xorg=$(sed "s|#.*||g" Packages-Xorg | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>cleanup.*||g" | sed "s|>x86_64.*||g" | sed "s|>i686||g" | sed "s|>free_x64.*||g" | sed "s|>free_uni||g" | sed "s|>nonfree_x64.*||g" | sed "s|>nonfree_uni||g" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
|
||||
elif [[ "${arch}" == "x86_64" ]]; then
|
||||
packages_xorg=$(sed "s|#.*||g" Packages-Xorg | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>cleanup.*||g" | sed "s|>i686.*||g" | sed "s|>x86_64||g" | sed "s|>free_x64||g" | sed "s|>free_uni||g" | sed "s|>nonfree_uni||g" | sed "s|>nonfree_x64||g" | sed "s|KERNEL|$dist_kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
|
||||
packages_xorg=$(sed "s|#.*||g" Packages-Xorg | sed "s| ||g" | sed "s|>dvd.*||g" | sed "s|>blacklist.*||g" | sed "s|>cleanup.*||g" | sed "s|>i686.*||g" | sed "s|>x86_64||g" | sed "s|>free_x64||g" | sed "s|>free_uni||g" | sed "s|>nonfree_uni||g" | sed "s|>nonfree_x64||g" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
|
||||
fi
|
||||
packages_xorg_cleanup=$(sed "s|#.*||g" Packages-Xorg | grep cleanup | sed "s|>cleanup||g" | sed "s|KERNEL|$dist_kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
|
||||
packages_xorg_cleanup=$(sed "s|#.*||g" Packages-Xorg | grep cleanup | sed "s|>cleanup||g" | sed "s|KERNEL|$kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
|
||||
}
|
||||
|
||||
load_pkgs_lng(){
|
||||
|
|
@ -523,7 +516,7 @@ load_profile(){
|
|||
done
|
||||
custom=${packages_custom#*-}
|
||||
custom=${custom,,}
|
||||
iso_file="${img_name}-${custom}-${iso_version}-${arch}.iso"
|
||||
iso_file="${iso_name}-${custom}-${dist_release}-${arch}.iso"
|
||||
if [[ -f pacman-${pacman_conf_arch}.conf ]]; then
|
||||
pacman_conf="pacman-${pacman_conf_arch}.conf"
|
||||
else
|
||||
|
|
|
|||
|
|
@ -275,11 +275,11 @@ configure_translation_pkgs(){
|
|||
}
|
||||
|
||||
install_localization(){
|
||||
if [ -e "/bootmnt/${install_dir}/${arch}/lng-image.sqfs" ] ; then
|
||||
if [ -e "/bootmnt/${iso_name}/${arch}/lng-image.sqfs" ] ; then
|
||||
echo "install translation packages" >> /tmp/livecd.log
|
||||
configure_translation_pkgs $1
|
||||
${PACMAN_LNG} -Sy
|
||||
if [ -e "/bootmnt/${install_dir}/${arch}/kde-image.sqfs" ] ; then
|
||||
if [ -e "/bootmnt/${iso_name}/${arch}/kde-image.sqfs" ] ; then
|
||||
${PACMAN_LNG} -S ${KDE_LNG_INST} &> /dev/null
|
||||
fi
|
||||
if [ -e "/usr/bin/firefox" ] ; then
|
||||
|
|
@ -415,7 +415,7 @@ configure_env(){
|
|||
sed -i -e "s~^.*Terminal=.*~Terminal=false~" "/etc/skel/Desktop/installer-launcher-cli.desktop"
|
||||
fi
|
||||
|
||||
if [[ -f "/bootmnt/${install_dir}/${arch}/${custom}-image.sqfs" ]]; then
|
||||
if [[ -f "/bootmnt/${iso_name}/${arch}/${custom}-image.sqfs" ]]; then
|
||||
case ${custom} in
|
||||
gnome|xfce|openbox|enlightenment|cinnamon|pekwm|lxde|mate)
|
||||
echo "QT_STYLE_OVERRIDE=gtk" >> /etc/environment
|
||||
|
|
|
|||
57
lib/util.sh
57
lib/util.sh
|
|
@ -260,45 +260,40 @@ load_config(){
|
|||
|
||||
##### iso settings #####
|
||||
|
||||
if [[ -z ${iso_version} ]];then
|
||||
if [[ -z ${dist_release} ]];then
|
||||
source /etc/lsb-release
|
||||
iso_version=${DISTRIB_RELEASE}
|
||||
dist_release=${DISTRIB_RELEASE}
|
||||
fi
|
||||
|
||||
if [[ -z ${branding} ]];then
|
||||
branding="MJRO"
|
||||
fi
|
||||
|
||||
iso_label="${branding}${iso_version//.}"
|
||||
|
||||
if [[ -z ${code_name} ]];then
|
||||
if [[ -z ${dist_codename} ]];then
|
||||
source /etc/lsb-release
|
||||
code_name="${DISTRIB_CODENAME}"
|
||||
dist_codename="${DISTRIB_CODENAME}"
|
||||
fi
|
||||
|
||||
if [[ -z ${img_name} ]];then
|
||||
img_name=manjaro
|
||||
fi
|
||||
|
||||
|
||||
if [[ -z ${compression} ]];then
|
||||
compression=xz
|
||||
fi
|
||||
|
||||
if [[ -z ${checksum_mode} ]];then
|
||||
checksum_mode='md5'
|
||||
fi
|
||||
|
||||
if [[ -z ${install_dir} ]];then
|
||||
install_dir=manjaro
|
||||
if [[ -z ${dist_branding} ]];then
|
||||
dist_branding="MJRO"
|
||||
fi
|
||||
|
||||
if [[ -z ${dist_version} ]];then
|
||||
dist_version=$(date +%Y.%m)
|
||||
fi
|
||||
|
||||
if [[ -z ${dist_iso} ]];then
|
||||
dist_iso="manjaroiso"
|
||||
if [[ -z ${dist_name} ]];then
|
||||
dist_name="Manjaro"
|
||||
fi
|
||||
|
||||
if [[ -z ${iso_name} ]];then
|
||||
iso_name="manjaro"
|
||||
fi
|
||||
|
||||
iso_label="${dist_branding}${dist_release//.}"
|
||||
|
||||
if [[ -z ${iso_compression} ]];then
|
||||
iso_compression=xz
|
||||
fi
|
||||
|
||||
if [[ -z ${iso_checksum} ]];then
|
||||
iso_checksum='md5'
|
||||
fi
|
||||
|
||||
return 0
|
||||
|
|
@ -312,12 +307,10 @@ load_profile_config(){
|
|||
|
||||
[[ -r ${profile_conf} ]] && source ${profile_conf}
|
||||
|
||||
if [[ -z ${dist_kernel} ]];then
|
||||
dist_kernel="linux319"
|
||||
if [[ -z ${kernel} ]];then
|
||||
kernel="linux319"
|
||||
fi
|
||||
|
||||
dist_kernel_ver=${dist_kernel#*linux}
|
||||
|
||||
if [[ -z ${efi_boot_loader} ]];then
|
||||
efi_boot_loader="grub"
|
||||
fi
|
||||
|
|
@ -331,7 +324,7 @@ load_profile_config(){
|
|||
fi
|
||||
|
||||
if [[ -z ${plymouth_theme} ]];then
|
||||
plymouth_theme=manjaro-elegant
|
||||
plymouth_theme="manjaro-elegant"
|
||||
fi
|
||||
|
||||
if [[ -z ${password} ]];then
|
||||
|
|
|
|||
Loading…
Reference in a new issue