blob: a932583832a88be6cadbb85753e33c5647a2d3bf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From 547603a359aa1fd2ba69c8dcb0cddeecd6d5a169 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 3 Dec 2014 10:43:32 +0000
Subject: [PATCH] setup-disk: pass nomodeset boot option
---
setup-disk.in | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/setup-disk.in b/setup-disk.in
index bae373a..f4401dd 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -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\":" \
--
2.2.0
|
