forked from mirrored-repos/manjaro-tools
[util-iso-*] msg cosmetics
This commit is contained in:
parent
da27694ed7
commit
68437cc20a
2 changed files with 33 additions and 33 deletions
|
@ -19,13 +19,13 @@ download_efi_shellv1(){
|
|||
|
||||
copy_efi_shells(){
|
||||
if [[ -f ${PKGDATADIR}/efi_shell/shellx64_v1.efi ]];then
|
||||
msg2 "copying shellx64_v1.efi ..."
|
||||
msg2 "Copying shellx64_v1.efi ..."
|
||||
cp ${PKGDATADIR}/efi_shell/shellx64_v1.efi $1/
|
||||
else
|
||||
download_efi_shellv1 "$1"
|
||||
fi
|
||||
if [[ -f ${PKGDATADIR}/efi_shell/shellx64_v2.efi ]];then
|
||||
msg2 "copying shellx64_v2.efi ..."
|
||||
msg2 "Copying shellx64_v2.efi ..."
|
||||
cp ${PKGDATADIR}/efi_shell/shellx64_v2.efi $1/
|
||||
else
|
||||
download_efi_shellv2 "$1"
|
||||
|
@ -41,21 +41,21 @@ gen_boot_image(){
|
|||
}
|
||||
|
||||
copy_efi_loaders(){
|
||||
msg2 "copying efi loaders ..."
|
||||
msg2 "Copying efi loaders ..."
|
||||
cp $1/usr/lib/prebootloader/PreLoader.efi $2/bootx64.efi
|
||||
cp $1/usr/lib/prebootloader/HashTool.efi $2/
|
||||
cp $1/usr/lib/gummiboot/gummibootx64.efi $2/loader.efi
|
||||
}
|
||||
|
||||
copy_boot_images(){
|
||||
msg2 "copying boot images ..."
|
||||
msg2 "Copying boot images ..."
|
||||
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
|
||||
}
|
||||
|
||||
copy_initcpio(){
|
||||
msg2 "copying 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-${iso_name}.conf
|
||||
|
@ -64,7 +64,7 @@ copy_initcpio(){
|
|||
write_loader_conf(){
|
||||
local fn=loader.conf
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
msg2 "Writing ${fn} ..."
|
||||
echo 'timeout 3' > ${conf}
|
||||
echo "default ${iso_name}-${arch}" >> ${conf}
|
||||
}
|
||||
|
@ -72,7 +72,7 @@ write_loader_conf(){
|
|||
write_efi_shellv1_conf(){
|
||||
local fn=uefi-shell-v1-${arch}.conf
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
msg2 "Writing ${fn} ..."
|
||||
echo "title UEFI Shell ${arch} v1" > ${conf}
|
||||
echo "efi /EFI/shellx64_v1.efi" >> ${conf}
|
||||
}
|
||||
|
@ -80,7 +80,7 @@ write_efi_shellv1_conf(){
|
|||
write_efi_shellv2_conf(){
|
||||
local fn=uefi-shell-v2-${arch}.conf
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
msg2 "Writing ${fn} ..."
|
||||
echo "title UEFI Shell ${arch} v2" > ${conf}
|
||||
echo "efi /EFI/shellx64_v2.efi" >> ${conf}
|
||||
}
|
||||
|
@ -88,7 +88,7 @@ write_efi_shellv2_conf(){
|
|||
write_dvd_conf(){
|
||||
local fn=${iso_name}-${arch}.conf
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
msg2 "Writing ${fn} ..."
|
||||
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}
|
||||
|
@ -99,7 +99,7 @@ write_dvd_conf(){
|
|||
write_dvd_nonfree_conf(){
|
||||
local fn=${iso_name}-${arch}-nonfree.conf
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
msg2 "Writing ${fn} ..."
|
||||
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}
|
||||
|
@ -110,7 +110,7 @@ write_dvd_nonfree_conf(){
|
|||
write_usb_conf(){
|
||||
local fn=${iso_name}-${arch}.conf
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
msg2 "Writing ${fn} ..."
|
||||
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}
|
||||
|
@ -121,7 +121,7 @@ write_usb_conf(){
|
|||
write_usb_nonfree_conf(){
|
||||
local fn=${iso_name}-${arch}-nonfree.conf
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
msg2 "Writing ${fn} ..."
|
||||
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}
|
||||
|
@ -131,7 +131,7 @@ write_usb_nonfree_conf(){
|
|||
|
||||
copy_isolinux_bin(){
|
||||
if [[ -e $1/usr/lib/syslinux/bios ]]; then
|
||||
msg2 "copying isolinux bios binaries ..."
|
||||
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
|
||||
|
@ -145,7 +145,7 @@ copy_isolinux_bin(){
|
|||
cp $1/usr/lib/syslinux/bios/libutil.c32 $2
|
||||
cp $1/usr/lib/syslinux/bios/libgpl.c32 $2
|
||||
else
|
||||
msg2 "copying isolinux binaries ..."
|
||||
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
|
||||
|
@ -159,7 +159,7 @@ copy_isolinux_bin(){
|
|||
write_isolinux_cfg(){
|
||||
local fn=isolinux.cfg
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
msg2 "Writing ${fn} ..."
|
||||
echo "default start" > ${conf}
|
||||
echo "implicit 1" >> ${conf}
|
||||
echo "display isolinux.msg" >> ${conf}
|
||||
|
@ -189,7 +189,7 @@ write_isolinux_cfg(){
|
|||
write_isolinux_msg(){
|
||||
local fn=isolinux.msg
|
||||
local conf=$1/${fn}
|
||||
msg2 "writing ${fn} ..."
|
||||
msg2 "Writing ${fn} ..."
|
||||
echo "Welcome to ${dist_name} Linux!" > ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo "To start the system enter 'start' and press <return>" >> ${conf}
|
||||
|
@ -205,7 +205,7 @@ write_isolinux_msg(){
|
|||
|
||||
update_isolinux_cfg(){
|
||||
local fn=isolinux.cfg
|
||||
msg2 "updating ${fn} ..."
|
||||
msg2 "Updating ${fn} ..."
|
||||
sed -i "s|%MISO_LABEL%|${iso_label}|g;
|
||||
s|%ISO_NAME%|${iso_name}|g;
|
||||
s|%ARCH%|${arch}|g" $1/${fn}
|
||||
|
@ -213,7 +213,7 @@ update_isolinux_cfg(){
|
|||
|
||||
update_isolinux_msg(){
|
||||
local fn=isolinux.msg
|
||||
msg2 "updating ${fn} ..."
|
||||
msg2 "Updating ${fn} ..."
|
||||
sed -i "s|%DIST_NAME%|${dist_name}|g" $1/${fn}
|
||||
}
|
||||
|
||||
|
@ -221,20 +221,20 @@ write_isomounts(){
|
|||
echo '# syntax: <img> <arch> <mount point> <type> <kernel argument>' > $1
|
||||
echo '# Sample kernel argument in syslinux: overlay=extra,extra2' >> $1
|
||||
echo '' >> $1
|
||||
msg2 "writing livecd entry ..."
|
||||
msg2 "Writing livecd entry ..."
|
||||
echo "${arch}/livecd-image.sqfs ${arch} / squashfs" >> $1
|
||||
if [[ -f Packages-Lng ]] ; then
|
||||
msg2 "writing lng entry ..."
|
||||
msg2 "Writing lng entry ..."
|
||||
echo "${arch}/lng-image.sqfs ${arch} / squashfs" >> $1
|
||||
fi
|
||||
if [[ -f Packages-Xorg ]] ; then
|
||||
msg2 "writing pkgs entry ..."
|
||||
msg2 "Writing pkgs entry ..."
|
||||
echo "${arch}/pkgs-image.sqfs ${arch} / squashfs" >> $1
|
||||
fi
|
||||
if [[ -f "${packages_custom}" ]] ; then
|
||||
msg2 "writing ${custom} entry ..."
|
||||
msg2 "Writing ${custom} entry ..."
|
||||
echo "${arch}/${custom}-image.sqfs ${arch} / squashfs" >> $1
|
||||
fi
|
||||
msg2 "writing root entry ..."
|
||||
msg2 "Writing root entry ..."
|
||||
echo "${arch}/root-image.sqfs ${arch} / squashfs" >> $1
|
||||
}
|
||||
|
|
|
@ -47,23 +47,23 @@ configure_plymouth(){
|
|||
configure_services_live(){
|
||||
case ${initsys} in
|
||||
'openrc')
|
||||
msg3 "Configuring ${initsys} ...."
|
||||
msg3 "Configuring [${initsys}] ...."
|
||||
for svc in ${start_openrc_live[@]}; do
|
||||
msg2 "Setting $svc ..."
|
||||
chroot $1 rc-update add $svc default &> /dev/null
|
||||
done
|
||||
msg3 "Done configuring ${initsys}"
|
||||
msg3 "Done configuring [${initsys}]"
|
||||
;;
|
||||
'systemd')
|
||||
msg3 "Configuring ${initsys} ...."
|
||||
msg3 "Configuring [${initsys}] ...."
|
||||
for svc in ${start_systemd_live[@]}; do
|
||||
msg2 "Setting $svc ..."
|
||||
chroot $1 systemctl enable $svc &> /dev/null
|
||||
done
|
||||
msg3 "Done configuring ${initsys}"
|
||||
msg3 "Done configuring [${initsys}]"
|
||||
;;
|
||||
*)
|
||||
msg3 "${initsys} is not supported!"
|
||||
msg3 "Unsupported: [${initsys}]!"
|
||||
break
|
||||
;;
|
||||
esac
|
||||
|
@ -88,23 +88,23 @@ configure_lsb(){
|
|||
configure_services(){
|
||||
case ${initsys} in
|
||||
'openrc')
|
||||
msg3 "Congiguring ${initsys} ...."
|
||||
msg3 "Congiguring [${initsys}] ...."
|
||||
for svc in ${start_openrc[@]}; do
|
||||
msg2 "Setting $svc ..."
|
||||
chroot $1 rc-update add $svc default &> /dev/null
|
||||
done
|
||||
msg3 "Done configuring ${initsys}"
|
||||
msg3 "Done configuring [${initsys}]"
|
||||
;;
|
||||
'systemd')
|
||||
msg3 "Congiguring ${initsys} ...."
|
||||
msg3 "Congiguring [${initsys}] ...."
|
||||
for svc in ${start_systemd[@]}; do
|
||||
msg2 "Setting $svc ..."
|
||||
chroot $1 systemctl enable $svc &> /dev/null
|
||||
done
|
||||
msg3 "Done configuring ${initsys}"
|
||||
msg3 "Done configuring [${initsys}]"
|
||||
;;
|
||||
*)
|
||||
msg3 "${initsys} is not supported!"
|
||||
msg3 "Unsupported: [${initsys}]!"
|
||||
break
|
||||
;;
|
||||
esac
|
||||
|
|
Loading…
Reference in a new issue