aboutsummaryrefslogtreecommitdiffstats
path: root/main/mkinitfs/git.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-05-18 13:43:33 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-05-18 13:43:33 +0000
commit40ecfa23b62812960a6c450762777b9f0d3d7dfa (patch)
tree43b83eb69c8ebc6ceada593fcce961990ff7107c /main/mkinitfs/git.patch
parenta58db9a030fa5e25fd7e6a86e33f07a5a84ded1c (diff)
downloadaports-40ecfa23b62812960a6c450762777b9f0d3d7dfa.tar.bz2
aports-40ecfa23b62812960a6c450762777b9f0d3d7dfa.tar.xz
main/mkinitfs: fix raid5
we need add crc32 module as a dep for raid5
Diffstat (limited to 'main/mkinitfs/git.patch')
-rw-r--r--main/mkinitfs/git.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/main/mkinitfs/git.patch b/main/mkinitfs/git.patch
new file mode 100644
index 0000000000..02cab69771
--- /dev/null
+++ b/main/mkinitfs/git.patch
@@ -0,0 +1,37 @@
+diff --git a/nlplug-findfs.c b/nlplug-findfs.c
+index b11b7b8..fd8f18f 100644
+--- a/nlplug-findfs.c
++++ b/nlplug-findfs.c
+@@ -527,6 +527,7 @@ static int find_apkovl(const char *dir, const char *outfile)
+ char pattern[PATH_MAX];
+ glob_t gl;
+ int r, fd;
++ int rc = 0;
+
+ if (outfile == NULL)
+ return 0;
+@@ -542,13 +543,21 @@ static int find_apkovl(const char *dir, const char *outfile)
+ err(1, "%s", outfile);
+
+ for (r = 0; r < gl.gl_pathc; r++) {
+- dbg("Found apkovl: %s", gl.gl_pathv[r]);
+- write(fd, gl.gl_pathv[r], strlen(gl.gl_pathv[r]));
++ const char *filename = gl.gl_pathv[r];
++ int len = strlen(filename);
++ dbg("Found apkovl: %s", filename);
++ write(fd, filename, len);
+ write(fd, "\n", 1);
++ /* we don't indicate that apkovl was found if we find
++ encrypted apkovls, because we need load keyboard drivers
++ before we exit
++ */
++ if (len>=7 && strcmp(&filename[len - 7], ".tar.gz") == 0)
++ rc = FOUND_APKOVL;
+ }
+ close(fd);
+ globfree(&gl);
+- return FOUND_APKOVL;
++ return rc;
+ }
+
+ static int find_bootrepos(const char *devnode, const char *type,