diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-03 10:59:06 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-03 11:00:17 +0000 |
| commit | 545977c1fde1dadc99987aedc2912d93243c28a9 (patch) | |
| tree | d632f691d52f19f44ebea66598a7775865dd13bd /main/alpine-conf/0001-setup-disk-pass-nomodeset-boot-option.patch | |
| parent | 352b4f4ace9c5d6789be649c7796ec99e57ae002 (diff) | |
| download | aports-545977c1fde1dadc99987aedc2912d93243c28a9.tar.bz2 aports-545977c1fde1dadc99987aedc2912d93243c28a9.tar.xz | |
main/alpine-conf: pass nomodeset boot option to installed disk
fixes #3555
Diffstat (limited to 'main/alpine-conf/0001-setup-disk-pass-nomodeset-boot-option.patch')
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-pass-nomodeset-boot-option.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/main/alpine-conf/0001-setup-disk-pass-nomodeset-boot-option.patch b/main/alpine-conf/0001-setup-disk-pass-nomodeset-boot-option.patch new file mode 100644 index 0000000000..a932583832 --- /dev/null +++ b/main/alpine-conf/0001-setup-disk-pass-nomodeset-boot-option.patch @@ -0,0 +1,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 + |