Commit 547603a3 authored by Natanael Copa's avatar Natanael Copa

setup-disk: pass nomodeset boot option

parent a800358c
......@@ -185,6 +185,15 @@ cleanup_chroot_mounts() {
done
}
has_bootopt() {
local opt="$1"
set -- $(cat /proc/cmdline)
for i; do
[ "$i" = "$opt" ] && return 0
done
return 1
}
install_mounted_root() {
local mnt="$1" mnt_boot= boot_fs= root_fs=
local initfs_features="ata base ide scsi usb virtio"
......@@ -275,6 +284,9 @@ install_mounted_root() {
if is_vmware; then
kernel_opts="pax_nouderef $kernel_opts"
fi
if has_bootopt nomodeset; then
kernel_opts="nomodeset $kernel_opts"
fi
modules="sd-mod,usb-storage,${root_fs}${raidmod}"
sed -e "s:^root=.*:root=$root:" \
-e "s:^default_kernel_opts=.*:default_kernel_opts=\"$kernel_opts\":" \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment