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

add option custom_boot_args

Browse source
This commit is contained in:
Bernhard Landauer 2019-12-11 15:44:30 +01:00
parent 1bfa0725f5
commit a1863f14e9
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/manjaro-tools.conf
View file

@ -64,6 +64,9 @@
# gpg key; leave empty or commented to skip sfs signing # gpg key; leave empty or commented to skip sfs signing
# gpgkey="" # gpgkey=""
# kernel parameters (array); example: custom_boot_args="'acpi_osi=Linux'"
# custom_boot_args=
########## calamares preferences ########## ########## calamares preferences ##########
#See branding.desc.d for reference #See branding.desc.d for reference

2
lib/util-iso.sh
View file

@ -456,7 +456,7 @@ make_image_boot() {
configure_grub(){ configure_grub(){
local default_args="misobasedir=${iso_name} misolabel=${iso_label}" \ local default_args="misobasedir=${iso_name} misolabel=${iso_label}" \
boot_args=('quiet' 'systemd.show_status=1' ${apparmor_boot_args}) boot_args=('quiet' 'systemd.show_status=1' ${custom_boot_args} ${apparmor_boot_args})
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" \