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 /main/mkinitfs/git.patch | |
| parent | 3321ebfe8d85bddce205cba4b52e9b1da956776a (diff) | |
| download | aports-cec48fb710e73358b126cfba36baa1acd73b8049.tar.bz2 aports-cec48fb710e73358b126cfba36baa1acd73b8049.tar.xz | |
main/mkinitfs: fix cryptroot=/dev/sdaX
Diffstat (limited to 'main/mkinitfs/git.patch')
| -rw-r--r-- | main/mkinitfs/git.patch | 9 |
1 files changed, 5 insertions, 4 deletions
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) { |