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 | |
| 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')
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-pass-nomodeset-boot-option.patch | 42 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
2 files changed, 50 insertions, 4 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 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 1419b5b9d1..fad18922ca 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -9,6 +9,7 @@ license="GPL2" depends="openrc" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 0001-update-kernel-fix-typo.patch + 0001-setup-disk-pass-nomodeset-boot-option.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -36,8 +37,11 @@ package() { } md5sums="d48adaa13dbba0e4c461b39a59fb1c10 alpine-conf-3.1.0.tar.xz -fe4a81cdf9d30c1f0bbcc9977e96410a 0001-update-kernel-fix-typo.patch" +fe4a81cdf9d30c1f0bbcc9977e96410a 0001-update-kernel-fix-typo.patch +4b7844387da57e3ffdcd1e09c0a45fb6 0001-setup-disk-pass-nomodeset-boot-option.patch" sha256sums="5c5c3081fba18c0303bd29ccf8caab5d550c0a767f9b3b1e6a0644b717661122 alpine-conf-3.1.0.tar.xz -cc1a2254eae01c2cde362cc7cf65d6e5ba7d53a7ced8a170b0502130af6877be 0001-update-kernel-fix-typo.patch" +cc1a2254eae01c2cde362cc7cf65d6e5ba7d53a7ced8a170b0502130af6877be 0001-update-kernel-fix-typo.patch +a5e486f41dafdca904e1d67b2bb26d871e6ec9597295e1fc21ea5d8995986570 0001-setup-disk-pass-nomodeset-boot-option.patch" sha512sums="22ce9a149171cf8503937b60d36ec2b69fb95123d3e3f7776cc3c9e0f14cdc8a9a2338be8c223233652cd1456f6b55bbc71ed0deda2efb75f0e62b67a4c40088 alpine-conf-3.1.0.tar.xz -7f30c7ecb696b4fbf815802bd9d369f2d21a2b2502efdeac3af260df72195c19199fddc81702eb204746146433a23c0649bcf1b8a71c57a34971c4457f0ac33f 0001-update-kernel-fix-typo.patch" +7f30c7ecb696b4fbf815802bd9d369f2d21a2b2502efdeac3af260df72195c19199fddc81702eb204746146433a23c0649bcf1b8a71c57a34971c4457f0ac33f 0001-update-kernel-fix-typo.patch +3ff38ab78bc0a07762c7c3668cf4daaa4ca2d030ef148e61de6dbb1df4589fd2c844c992f35ce64aa9cc3125d7422ba9deb727259cc68a61e7f6d6ff22de16f7 0001-setup-disk-pass-nomodeset-boot-option.patch" |