diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-01-26 21:24:10 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-01-26 21:28:20 +0000 |
| commit | 9d5033df27320084ede522f307a5ac81ea77e547 (patch) | |
| tree | f1a11bd97b950fdc5757800b23574ca7667a0bd4 /main/mkinitfs/APKBUILD | |
| parent | 1acade4e029334027ca5011b6ccf9f42f245db63 (diff) | |
| download | aports-9d5033df27320084ede522f307a5ac81ea77e547.tar.bz2 aports-9d5033df27320084ede522f307a5ac81ea77e547.tar.xz | |
main/mkinitfs: fix zfs root with grub
grub-mkconfig will generate a root=ZFS=pool/path line. Fix nlplug-findfs
to deal with search device ZFS=... and fix initramfs to also deal with a
missing rootfstype=zfs
A side-effect of this is that it is faster to boot zfs root since we no
longer need to wait for nlplug-findfs timeout of 5 seconds.
Diffstat (limited to 'main/mkinitfs/APKBUILD')
| -rw-r--r-- | main/mkinitfs/APKBUILD | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 9d8926249b..198d7d696b 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=3.4.0 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=2 pkgdesc="Tool to generate initramfs images for Alpine" url="https://git.alpinelinux.org/cgit/mkinitfs" arch="all" @@ -18,6 +18,8 @@ install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade" triggers="$pkgname.trigger=/usr/share/kernel/*" source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz 0001-features-add-crc32-modules-to-f2fs.patch + 0001-nlplug-findfs-detect-zfs-pool.patch + 0002-init-fix-root-ZFS.-from-grub.patch " builddir="$srcdir/$pkgname-$_ver" @@ -33,4 +35,6 @@ package() { } sha512sums="6c7c1e49e49203f50784e08c8dec9b6bc3bbe5e238d91e85a0a61c09623f6c7b7dfcb490f20e1d6317cbb87287d23e7ef848f1ebf563392cee4b80499676cffc mkinitfs-3.4.0.tar.xz -00d598c5bbcfc0cc99a43aefae388bb1740e5e6c678c0eca14c3707f81d6378f9385bc15da3cd383e97e4a107adea739bdb1a80c1100f93597dcea37eaf8c6f8 0001-features-add-crc32-modules-to-f2fs.patch" +00d598c5bbcfc0cc99a43aefae388bb1740e5e6c678c0eca14c3707f81d6378f9385bc15da3cd383e97e4a107adea739bdb1a80c1100f93597dcea37eaf8c6f8 0001-features-add-crc32-modules-to-f2fs.patch +064ee531edff553f2a1eacba9805d156e3257c87cfacd075f149a318132dd0cc96ff1a7c2766d370b4d4a1c3aa5bb6f6dfb3a76f2696f105df3787ade1f1f73b 0001-nlplug-findfs-detect-zfs-pool.patch +7ad0a117678b2e7e1a6366db7194525aca3cff04159bba8199feeb5e51399745436e52129d61ad7d48b880dd0a6e6b50d529f0ce2361580ed60e49d9e5b90017 0002-init-fix-root-ZFS.-from-grub.patch" |