diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-10 09:25:00 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-10 09:25:00 +0000 |
| commit | bf0e73769f4ae51ddf5edd9c2ea9823002468a53 (patch) | |
| tree | 90c233e29157e2d7f8455272ae9d4898d23afb3e /main/mkinitfs | |
| parent | 24962c3c33f5cd07c774f45de2ba22cba9db8bf2 (diff) | |
| download | aports-bf0e73769f4ae51ddf5edd9c2ea9823002468a53.tar.bz2 aports-bf0e73769f4ae51ddf5edd9c2ea9823002468a53.tar.xz | |
main/mkinitfs: fix cryptsetup with UUID=...
Diffstat (limited to 'main/mkinitfs')
| -rw-r--r-- | main/mkinitfs/0001-init-resolve-UUID-.-devices-for-cryptsetup.patch | 29 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 12 |
2 files changed, 37 insertions, 4 deletions
diff --git a/main/mkinitfs/0001-init-resolve-UUID-.-devices-for-cryptsetup.patch b/main/mkinitfs/0001-init-resolve-UUID-.-devices-for-cryptsetup.patch new file mode 100644 index 0000000000..e297b60182 --- /dev/null +++ b/main/mkinitfs/0001-init-resolve-UUID-.-devices-for-cryptsetup.patch @@ -0,0 +1,29 @@ +From 979090f14647d6e6b0c0d399580c22cbf48b0fef Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 10 Mar 2015 09:20:34 +0000 +Subject: [PATCH] init: resolve UUID=... devices for cryptsetup + +recent version of cryptsetup does not seem to work with UUID=... devices +unless udev is used to create /dev/disk/by-uuid symlinks. + +We work around that by resolving UUID=... to the device. +--- + initramfs-init.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index fd3e510..d687e64 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -251,7 +251,7 @@ start_cryptsetup() { + modprobe dm-crypt + if [ -n "$KOPT_cryptroot" ]; then + modprobe dm-crypt +- cryptsetup luksOpen "$KOPT_cryptroot" "$KOPT_cryptdm" ++ cryptsetup luksOpen $(resolve_dev "$KOPT_cryptroot") "$KOPT_cryptdm" + fi + } + +-- +2.3.2 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 09b4d53804..ce8bbffcc8 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=2.7.1 _ver=${pkgver%_git*} -pkgrel=3 +pkgrel=4 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox apk-tools>=2.0 lddtree>=1.25" @@ -11,6 +11,7 @@ triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz 0001-init-fix-splash-fifo-and-make-config-file-optional.patch 0002-support-for-tmpfs-overlay-over-root.patch + 0001-init-resolve-UUID-.-devices-for-cryptsetup.patch " arch="noarch" license="GPL-2" @@ -38,10 +39,13 @@ package() { } md5sums="9a815b988bb5be3ac3ab09e7904027e6 mkinitfs-2.7.1.tar.xz 68c2d5e5e15b6f691f39b8c26dd9514a 0001-init-fix-splash-fifo-and-make-config-file-optional.patch -d70426b776b5ae61f6712c19f6e7d203 0002-support-for-tmpfs-overlay-over-root.patch" +d70426b776b5ae61f6712c19f6e7d203 0002-support-for-tmpfs-overlay-over-root.patch +c92cf3e9dbd8fa32254dc66d7a649fae 0001-init-resolve-UUID-.-devices-for-cryptsetup.patch" sha256sums="152acf1f4f23b8919a79c6a29590cff2db594ad42dec1b60316e9740366ec43d mkinitfs-2.7.1.tar.xz 8d6b5f6b2024dce0c26846966b236513726ced6d61eca335524b5759f957ecda 0001-init-fix-splash-fifo-and-make-config-file-optional.patch -6c7b08c9e38f7816cfcd8519c9622b7252a90769898e705e2a16f1112a99f96a 0002-support-for-tmpfs-overlay-over-root.patch" +6c7b08c9e38f7816cfcd8519c9622b7252a90769898e705e2a16f1112a99f96a 0002-support-for-tmpfs-overlay-over-root.patch +5385b4f03f77f71c79ca46d0c412193b70290d1da37350291f6daec00cbbe166 0001-init-resolve-UUID-.-devices-for-cryptsetup.patch" sha512sums="632f9119dccf0911989e8d09d587a553327c9644fd75e50dd58a19590c0a1ac955de1a50a46c68aa711288c480c0408969c725832e9d2e7631ff8c64b12d0217 mkinitfs-2.7.1.tar.xz 4cbfc985974b427c6136b28777c39ffd6963bb876d902c182853e7af8311265d2516f6638ea7fb818ddba3a0bdd9109080d62efaedb514b8e6cbea09812adefa 0001-init-fix-splash-fifo-and-make-config-file-optional.patch -d6eade69168f1349abffb732f50630dbab9f11d655814076479b2523d2a4920629e6d6e51f86678207b5f80775bd9d672ca08df36c1fd6eb88535abb7b8df911 0002-support-for-tmpfs-overlay-over-root.patch" +d6eade69168f1349abffb732f50630dbab9f11d655814076479b2523d2a4920629e6d6e51f86678207b5f80775bd9d672ca08df36c1fd6eb88535abb7b8df911 0002-support-for-tmpfs-overlay-over-root.patch +6ee4bc5448b30bd0d458ff47dc8fe48cc22e1489bbd52464adc54697dfb3bc5a7bd92cdedab49fafb059bf79ffe5ff39cc94280cf17d029d4d0f9addb972ee71 0001-init-resolve-UUID-.-devices-for-cryptsetup.patch" |