{system => legacy}/busybox: fucking inflatable fucking busybox

1 files changed, 59 insertions, 0 deletions

diff --git a/legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch b/legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
new file mode 100644
index 000000000..72df8ecf9
--- /dev/null
+++ b/legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
@@ -0,0 +1,59 @@
+From bce882404ab41d32d5d9def274e49264717135b2 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 28 Nov 2017 13:23:17 +0100
+Subject: [PATCH 02/16] fsck: resolve LABEL=.../UUID=... spec to device
+
+---
+ e2fsprogs/fsck.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
+index 1c285bb92..5af38c0aa 100644
+--- a/e2fsprogs/fsck.c
++++ b/e2fsprogs/fsck.c
+@@ -60,6 +60,7 @@
+ //usage:     "\n	-t TYPE	List of filesystem types to check"
+ 
+ #include "libbb.h"
++#include "volume_id.h"
+ #include "common_bufsiz.h"
+ 
+ /* "progress indicator" code is somewhat buggy and ext[23] specific.
+@@ -523,12 +524,13 @@ static int wait_many(int flags)
+  * Execute a particular fsck program, and link it into the list of
+  * child processes we are waiting for.
+  */
+-static void execute(const char *type, const char *device,
++static void execute(const char *type, const char *spec,
+ 		const char *mntpt /*, int interactive */)
+ {
+ 	int i;
+ 	struct fsck_instance *inst;
+ 	pid_t pid;
++	char *device = (char *)spec;
+ 
+ 	G.args[0] = xasprintf("fsck.%s", type);
+ 
+@@ -543,7 +545,8 @@ static void execute(const char *type, const char *device,
+ 	}
+ #endif
+ 
+-	G.args[G.num_args - 2] = (char*)device;
++	resolve_mount_spec(&device);
++	G.args[G.num_args - 2] = device;
+ 	/* G.args[G.num_args - 1] = NULL; - already is */
+ 
+ 	if (G.verbose || G.noexecute) {
+@@ -972,9 +975,6 @@ int fsck_main(int argc UNUSED_PARAM, char **argv)
+ 
+ 		/* "/dev/blk" or "/path" or "UUID=xxx" or "LABEL=xxx" */
+ 		if ((arg[0] == '/' && !opts_for_fsck) || strchr(arg, '=')) {
+-// FIXME: must check that arg is a blkdev, or resolve
+-// "/path", "UUID=xxx" or "LABEL=xxx" into block device name
+-// ("UUID=xxx"/"LABEL=xxx" can probably shifted to fsck.auto duties)
+ 			devices = xrealloc_vector(devices, 2, num_devices);
+ 			devices[num_devices++] = arg;
+ 			continue;
+-- 
+2.16.2
+