diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-22 14:28:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-22 14:29:37 +0000 |
| commit | cec48fb710e73358b126cfba36baa1acd73b8049 (patch) | |
| tree | 9e6ae14ab1567c7310218b96f047b82e69baaf5f | |
| parent | 3321ebfe8d85bddce205cba4b52e9b1da956776a (diff) | |
| download | aports-cec48fb710e73358b126cfba36baa1acd73b8049.tar.bz2 aports-cec48fb710e73358b126cfba36baa1acd73b8049.tar.xz | |
main/mkinitfs: fix cryptroot=/dev/sdaX
| -rw-r--r-- | main/mkinitfs/APKBUILD | 8 | ||||
| -rw-r--r-- | main/mkinitfs/git.patch | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 4c5da61f75..459c30e731 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=2.8.0_git20151022 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs makedepends="kmod-dev util-linux-dev linux-headers" @@ -37,8 +37,8 @@ package() { make install DESTDIR="$pkgdir" || return 1 } md5sums="1a321336d97b22257349ddd36884ec34 mkinitfs-2.8.0.tar.xz -a0259eb62f456868660a56cfd681fbe6 git.patch" +1d160ee8bd692c86699586b8644b6185 git.patch" sha256sums="5ffe4c5ec9e0ff4581e5b24301fd30d0964120d6b30ee78ea79f31ff48eeab73 mkinitfs-2.8.0.tar.xz -74c141160c1ce7db6b3d79066993b91db9ce1dd227b02cac78a00f4033f78d4c git.patch" +79bbbbda9a34cc865721ebceaf2fa548324cd2f6d5bc61bdab8d7350070e64f0 git.patch" sha512sums="c103003f95c7d7d94daa41d0a81b210a0208c93d77203978554fb127a21e2f143b56990865fc53e2c5c732ef663603b297da63d31f915b1e3a3e0f3818aa8f2e mkinitfs-2.8.0.tar.xz -8a87dba55eb8d72da95185e1fe04d3f60f5c3f48983637c97ba63053d19baf92a5a3bb8901c7878ce8b6565497b6a5821544019f94a18710c5f6da01d3f2c2d2 git.patch" +66c7a5cc27e0bdc63c3286e07f2d0c3704df6d9fa2f03f054f5267564dfc3fa8233463a49b592189380fb7e1cafff3e17a825c0ade6f906e9177035650094a98 git.patch" diff --git a/main/mkinitfs/git.patch b/main/mkinitfs/git.patch index fb94a1769b..6e812b7d2f 100644 --- a/main/mkinitfs/git.patch +++ b/main/mkinitfs/git.patch @@ -831,10 +831,10 @@ index 04dc99c..14c728f 100755 if [ -n "$list_features" ]; then diff --git a/nlplug-findfs.c b/nlplug-findfs.c new file mode 100644 -index 0000000..547fb76 +index 0000000..f1a58fd --- /dev/null +++ b/nlplug-findfs.c -@@ -0,0 +1,778 @@ +@@ -0,0 +1,779 @@ + +/* + * Copy me if you can. @@ -1267,14 +1267,15 @@ index 0000000..547fb76 + if (searchdev == NULL && bootrepos == NULL && apkovls == NULL) + return 0; + -+ if (searchdev && strcmp(devname, searchdev) == 0) { ++ snprintf(devnode, sizeof(devnode), "/dev/%s", devname); ++ if (searchdev && (strcmp(devname, searchdev) == 0 ++ || strcmp(devnode, searchdev) == 0)) { + return FOUND_DEVICE; + } + + if (cache == NULL) + blkid_get_cache(&cache, NULL); + -+ snprintf(devnode, sizeof(devnode), "/dev/%s", devname); + type = blkid_get_tag_value(cache, "TYPE", devnode); + + if (searchdev != NULL) { |