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

util-iso-boot: fix boot_args on systemd

Browse source
This commit is contained in:
udeved 2017-03-27 15:32:47 +02:00
parent 395ebf1dbe
commit 722450350e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,16 +46,16 @@ prepare_boot_extras(){
configure_grub(){ configure_grub(){
local default_args="misobasedir=${iso_name} misolabel=${iso_label}" \ local default_args="misobasedir=${iso_name} misolabel=${iso_label}" \
video_args="nouveau.modeset=1 i915.modeset=1 radeon.modeset=1" \ video_args="nouveau.modeset=1 i915.modeset=1 radeon.modeset=1" \
boot_args=(quiet) boot_args=('quiet')
[[ $2 == 'systemd' ]] && boot_args+=(systemd.show_status=1) [[ $2 == 'systemd' ]] && boot_args+=('systemd.show_status=1')
local mhwd_args="nonfree=$4" local mhwd_args="nonfree=$4"
sed -e "s|@DIST_NAME@|${dist_name}|g" \ sed -e "s|@DIST_NAME@|${dist_name}|g" \
-e "s|@ARCH@|${target_arch}|g" \ -e "s|@ARCH@|${target_arch}|g" \
-e "s|@DEFAULT_ARGS@|${default_args}|g" \ -e "s|@DEFAULT_ARGS@|${default_args}|g" \
-e "s|@VIDEO_ARGS@|${video_args}|g" \ -e "s|@VIDEO_ARGS@|${video_args}|g" \
-e "s|@BOOT_ARGS@|${boot_args[@]}|g" \ -e "s|@BOOT_ARGS@|${boot_args[*]}|g" \
-e "s|@MHWD_ARGS@|${mhwd_args}|g" \ -e "s|@MHWD_ARGS@|${mhwd_args}|g" \
-e "s|@PROFILE@|$3|g" \ -e "s|@PROFILE@|$3|g" \
-i $1 -i $1
@ -107,7 +107,7 @@ prepare_grub(){
truncate -s ${size} "${efi_img}" truncate -s ${size} "${efi_img}"
mkfs.fat -n MISO_EFI "${efi_img}" &>/dev/null mkfs.fat -n MISO_EFI "${efi_img}" &>/dev/null
prepare_dir "${mnt}" prepare_dir "${mnt}"
mount_img "${efi_img}" "${mnt}" mount_img "${efi_img}" "${mnt}"
prepare_dir ${mnt}/efi/boot prepare_dir ${mnt}/efi/boot
msg2 "Building %s ..." "${img}" msg2 "Building %s ..." "${img}"
grub-mkimage -d ${grub}/${platform} -o ${mnt}/efi/boot/${img} -O ${platform} -p ${prefix} iso9660 grub-mkimage -d ${grub}/${platform} -o ${mnt}/efi/boot/${img} -O ${platform} -p ${prefix} iso9660