diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-17 19:30:48 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-17 19:30:48 +0000 |
| commit | 6ee6047b74039f32048686d8e6df918f87a1ee68 (patch) | |
| tree | c4e0396d83d999106b4f17218c280bc5da94f34f | |
| parent | 05b96ec9d84aee92aab7567191daee2e4925a338 (diff) | |
| download | aports-6ee6047b74039f32048686d8e6df918f87a1ee68.tar.bz2 aports-6ee6047b74039f32048686d8e6df918f87a1ee68.tar.xz | |
main/mkinitfs: fix boot from lvm root
| -rw-r--r-- | main/mkinitfs/0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch | 32 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 12 |
2 files changed, 40 insertions, 4 deletions
diff --git a/main/mkinitfs/0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch b/main/mkinitfs/0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch new file mode 100644 index 000000000..92e53a383 --- /dev/null +++ b/main/mkinitfs/0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch @@ -0,0 +1,32 @@ +From 8785cfa9ce642d8b4cde64ea0e4c497aa55a5780 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 17 Nov 2014 20:15:52 +0100 +Subject: [PATCH] init: lvm: run vgchange even if vgscan does not return + success + +It seems like vgscan does not return success in initramfs, even if +the needed devices noded are created. + +Ignore errors and try run vgchange in any case. +--- + initramfs-init.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index 0ff8b6b..7831995 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -258,8 +258,8 @@ start_cryptsetup() { + start_lvm() { + [ -x /sbin/lvm ] || return + modprobe dm-mod +- lvm vgscan --mknodes --ignorelockingfailure >/dev/null 2>&1 &&\ +- lvm vgchange --ignorelockingfailure -a y >/dev/null 2>&1 ++ lvm vgscan --mknodes --ignorelockingfailure >/dev/null 2>&1 ++ lvm vgchange --ignorelockingfailure -a y >/dev/null 2>&1 + } + + # determine the default interface to use if ip=dhcp is set +-- +2.1.3 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 8f995e1af..bbd064569 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,13 +2,14 @@ pkgname=mkinitfs pkgver=2.7.0 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox apk-tools>=2.0 lddtree>=1.25" install="$pkgname.pre-upgrade" triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz + 0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch " arch="noarch" license="GPL-2" @@ -34,6 +35,9 @@ package() { cd "$_builddir" make install DESTDIR="$pkgdir" || return 1 } -md5sums="fbf7a5ec2530490f9edd8df4541eff99 mkinitfs-2.7.0.tar.xz" -sha256sums="99019951e0ea914f00bf94dea69a0f9456bdb4f5934d8c6de3e5ed628b4734e6 mkinitfs-2.7.0.tar.xz" -sha512sums="ec0bad81773374ae7221da53cc889b3bddc2749c207715817f691ba1fbba5ee3967c1656283212525f0486a23b9b05379900473ee6188474bdbd6325ee50d1da mkinitfs-2.7.0.tar.xz" +md5sums="fbf7a5ec2530490f9edd8df4541eff99 mkinitfs-2.7.0.tar.xz +de01f4ac9c44fe84ce0022bd56f1f386 0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch" +sha256sums="99019951e0ea914f00bf94dea69a0f9456bdb4f5934d8c6de3e5ed628b4734e6 mkinitfs-2.7.0.tar.xz +a1ee3fdffbf2bf8311e8d37f6e8b3d6c0b787dc3e1e6a02bf45fa9dfe84baa33 0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch" +sha512sums="ec0bad81773374ae7221da53cc889b3bddc2749c207715817f691ba1fbba5ee3967c1656283212525f0486a23b9b05379900473ee6188474bdbd6325ee50d1da mkinitfs-2.7.0.tar.xz +3f053f0956697cb38e1248b52365d033e22910ae44437a4f64eef85fe426a2f4e90b66557c06f053c8220466fc2f54c6d4de8da1a8db7466b4ddac4bf13372a7 0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch" |