X-Git-Url: http://git.openwrt.org/?p=project%2Ffstools.git;a=blobdiff_plain;f=block.c;h=569bf565d5a1a7c15c59fde81b783d7ec9d1a828;hp=3d06185646fa504ab12f0f0bafae32318b9adc55;hb=84269037b75de93bdd4ea75b7f50ba77ba976377;hpb=f1bb762f0245fcbfa6555fd90e71de61480c301c

diff --git a/block.c b/block.c
index 3d06185..569bf56 100644
--- a/block.c
+++ b/block.c
@@ -536,23 +536,6 @@ static void cache_load(int mtd)
 }
 
 
-static int print_block_uci(struct probe_info *pr)
-{
-	if (!strcmp(pr->type, "swap")) {
-		printf("config 'swap'\n");
-	} else {
-		printf("config 'mount'\n");
-		printf("\toption\ttarget\t'/mnt/%s'\n", basename(pr->dev));
-	}
-	if (pr->uuid)
-		printf("\toption\tuuid\t'%s'\n", pr->uuid);
-	else
-		printf("\toption\tdevice\t'%s'\n", pr->dev);
-	printf("\toption\tenabled\t'0'\n\n");
-
-	return 0;
-}
-
 static struct probe_info* find_block_info(char *uuid, char *label, char *path)
 {
 	struct probe_info *pr = NULL;
@@ -579,7 +562,6 @@ static char* find_mount_point(char *block)
 {
 	FILE *fp = fopen("/proc/self/mountinfo", "r");
 	static char line[256];
-	int len = strlen(block);
 	char *point = NULL, *pos, *tmp, *cpoint, *devname;
 	struct stat s;
 	int rstat;
@@ -643,7 +625,7 @@ static char* find_mount_point(char *block)
 
 		*pos = '\0';
 		devname = tmp;
-		if (!strncmp(block, devname, len)) {
+		if (!strcmp(block, devname)) {
 			point = strdup(cpoint);
 			break;
 		}
@@ -666,6 +648,30 @@ static char* find_mount_point(char *block)
 	return point;
 }
 
+static int print_block_uci(struct probe_info *pr)
+{
+	if (!strcmp(pr->type, "swap")) {
+		printf("config 'swap'\n");
+	} else {
+		char *mp = find_mount_point(pr->dev);
+
+		printf("config 'mount'\n");
+		if (mp) {
+			printf("\toption\ttarget\t'%s'\n", mp);
+			free(mp);
+		} else {
+			printf("\toption\ttarget\t'/mnt/%s'\n", basename(pr->dev));
+		}
+	}
+	if (pr->uuid)
+		printf("\toption\tuuid\t'%s'\n", pr->uuid);
+	else
+		printf("\toption\tdevice\t'%s'\n", pr->dev);
+	printf("\toption\tenabled\t'0'\n\n");
+
+	return 0;
+}
+
 static int print_block_info(struct probe_info *pr)
 {
 	static char *mp;
@@ -709,7 +715,7 @@ static void check_filesystem(struct probe_info *pr)
 	struct stat statbuf;
 	const char *e2fsck = "/usr/sbin/e2fsck";
 	const char *f2fsck = "/usr/sbin/fsck.f2fs";
-	const char *dosfsck = "/usr/sbin/dosfsck";
+	const char *fatfsck = "/usr/sbin/fsck.fat";
 	const char *btrfsck = "/usr/bin/btrfsck";
 	const char *ntfsck = "/usr/bin/ntfsfix";
 	const char *ckfs;
@@ -719,7 +725,7 @@ static void check_filesystem(struct probe_info *pr)
 		return;
 
 	if (!strncmp(pr->type, "vfat", 4)) {
-		ckfs = dosfsck;
+		ckfs = fatfsck;
 	} else if (!strncmp(pr->type, "f2fs", 4)) {
 		ckfs = f2fsck;
 	} else if (!strncmp(pr->type, "ext", 3)) {
@@ -880,35 +886,6 @@ static int exec_mount(const char *source, const char *target,
 	return err;
 }
 
-static int hotplug_call_mount(const char *action, const char *device)
-{
-	pid_t pid;
-	int err = 0;
-
-	pid = fork();
-	if (!pid) {
-		char * const argv[] = { "hotplug-call", "mount", NULL };
-
-		setenv("ACTION", action, 1);
-		setenv("DEVICE", device, 1);
-
-		execv("/sbin/hotplug-call", argv);
-		exit(-1);
-	} else if (pid > 0) {
-		int status;
-
-		pid = waitpid(pid, &status, 0);
-		if (pid <= 0 || !WIFEXITED(status) || WEXITSTATUS(status)) {
-			err = -ENOEXEC;
-			ULOG_ERR("hotplug-call call failed\n");
-		}
-	} else {
-		err = -errno;
-	}
-
-	return err;
-}
-
 static int handle_mount(const char *source, const char *target,
                         const char *fstype, struct mount *m)
 {
@@ -960,7 +937,8 @@ static int handle_mount(const char *source, const char *target,
 	return err;
 }
 
-static int blockd_notify(char *device, struct mount *m, struct probe_info *pr)
+static int blockd_notify(const char *method, char *device, struct mount *m,
+			 struct probe_info *pr)
 {
 	struct ubus_context *ctx = ubus_connect(NULL);
 	uint32_t id;
@@ -1013,7 +991,7 @@ static int blockd_notify(char *device, struct mount *m, struct probe_info *pr)
 			blobmsg_add_u32(&buf, "remove", 1);
 		}
 
-		err = ubus_invoke(ctx, id, "hotplug", buf.head, NULL, NULL, 3000);
+		err = ubus_invoke(ctx, id, method, buf.head, NULL, NULL, 3000);
 	} else {
 		err = -ENOENT;
 	}
@@ -1026,6 +1004,7 @@ static int blockd_notify(char *device, struct mount *m, struct probe_info *pr)
 static int mount_device(struct probe_info *pr, int type)
 {
 	struct mount *m;
+	struct stat st;
 	char _target[32];
 	char *target;
 	char *device;
@@ -1047,19 +1026,23 @@ static int mount_device(struct probe_info *pr, int type)
 		return 0;
 	}
 
-	mp = find_mount_point(pr->dev);
-	if (mp && (type != TYPE_HOTPLUG)) {
-		ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
-		free(mp);
-		return -1;
-	}
-
 	m = find_block(pr->uuid, pr->label, device, NULL);
 	if (m && m->extroot)
 		return -1;
 
+	mp = find_mount_point(pr->dev);
+	if (mp) {
+		if (m && m->type == TYPE_MOUNT && strcmp(m->target, mp)) {
+			ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
+			err = -1;
+		} else
+			err = 0;
+		free(mp);
+		return err;
+	}
+
 	if (type == TYPE_HOTPLUG)
-		blockd_notify(device, m, pr);
+		blockd_notify("hotplug", device, m, pr);
 
 	/* Check if device should be mounted & set the target directory */
 	if (m) {
@@ -1103,6 +1086,8 @@ static int mount_device(struct probe_info *pr, int type)
 		check_filesystem(pr);
 
 	mkdir_p(target);
+	if (!lstat(target, &st) && S_ISLNK(st.st_mode))
+		unlink(target);
 
 	err = handle_mount(pr->dev, target, pr->type, m);
 	if (err) {
@@ -1113,12 +1098,13 @@ static int mount_device(struct probe_info *pr, int type)
 
 	handle_swapfiles(true);
 
-	hotplug_call_mount("add", device);
+	if (type != TYPE_AUTOFS)
+		blockd_notify("mount", device, NULL, NULL);
 
 	return 0;
 }
 
-static int umount_device(char *path)
+static int umount_device(char *path, int type, bool all)
 {
 	char *mp;
 	int err;
@@ -1126,15 +1112,20 @@ static int umount_device(char *path)
 	mp = find_mount_point(path);
 	if (!mp)
 		return -1;
+	if (!strcmp(mp, "/") && !all)
+		return 0;
 
-	hotplug_call_mount("remove", basename(path));
+	if (type != TYPE_AUTOFS)
+		blockd_notify("umount", basename(path), NULL, NULL);
 
 	err = umount2(mp, MNT_DETACH);
-	if (err)
+	if (err) {
 		ULOG_ERR("unmounting %s (%s) failed (%d) - %m\n", path, mp,
 			 errno);
-	else
+	} else {
 		ULOG_INFO("unmounted %s (%s)\n", path, mp);
+		rmdir(mp);
+	}
 
 	free(mp);
 	return err;
@@ -1150,9 +1141,9 @@ static int mount_action(char *action, char *device, int type)
 
 	if (!strcmp(action, "remove")) {
 		if (type == TYPE_HOTPLUG)
-			blockd_notify(device, NULL, NULL);
+			blockd_notify("hotplug", device, NULL, NULL);
 
-		umount_device(path);
+		umount_device(path, type, true);
 
 		return 0;
 	} else if (strcmp(action, "add")) {
@@ -1175,6 +1166,8 @@ static int main_hotplug(int argc, char **argv)
 
 static int main_autofs(int argc, char **argv)
 {
+	int err = 0;
+
 	if (argc < 3)
 		return -1;
 
@@ -1186,20 +1179,34 @@ static int main_autofs(int argc, char **argv)
 
 		cache_load(0);
 		list_for_each_entry(pr, &devices, list) {
-			struct mount *m = find_block(pr->uuid, pr->label, NULL, NULL);
+			struct mount *m;
+			char *mp;
 
-			if (m && m->autofs)
-				mount_device(pr, TYPE_HOTPLUG);
-			else
-				blockd_notify(pr->dev, m, pr);
+			if (!strcmp(pr->type, "swap"))
+				continue;
+
+			m = find_block(pr->uuid, pr->label, NULL, NULL);
+			if (m && m->extroot)
+				continue;
+
+			blockd_notify("hotplug", pr->dev, m, pr);
+			if ((!m || !m->autofs) && (mp = find_mount_point(pr->dev))) {
+				blockd_notify("mount", pr->dev, NULL, NULL);
+				free(mp);
+			}
 		}
-		return 0;
+	} else {
+		if (argc < 4)
+			return -EINVAL;
+
+		err = mount_action(argv[2], argv[3], TYPE_AUTOFS);
 	}
 
-	if (argc < 4)
-		return -EINVAL;
+	if (err) {
+		ULOG_ERR("autofs: \"%s\" action has failed: %d\n", argv[2], err);
+	}
 
-	return mount_action(argv[2], argv[3], TYPE_AUTOFS);
+	return err;
 }
 
 static int find_block_mtd(char *name, char *part, int plen)
@@ -1282,8 +1289,7 @@ static int find_block_ubi_RO(libubi_t libubi, char *name, char *part, int plen)
 
 	return err;
 }
-
-#else
+#endif
 
 static int find_root_dev(char *buf, int len)
 {
@@ -1314,8 +1320,6 @@ static int find_root_dev(char *buf, int len)
 	return -1;
 }
 
-#endif
-
 static int test_fs_support(const char *name)
 {
 	char line[128], *p;
@@ -1340,78 +1344,91 @@ static int test_fs_support(const char *name)
 	return rv;
 }
 
+/**
+ * Check if mounted partition is a valid extroot
+ *
+ * @path target mount point
+ *
+ * Valid extroot partition has to contain /etc/.extroot-uuid with UUID of root
+ * device. This function reads UUID and verifies it OR writes UUID to
+ * .extroot-uuid if it doesn't exist yet (first extroot usage).
+ */
 static int check_extroot(char *path)
 {
 	struct probe_info *pr = NULL;
+	struct probe_info *tmp;
+	struct stat s;
+	char uuid[64] = { 0 };
 	char devpath[32];
+	char tag[64];
+	FILE *fp;
+	int err;
 
+	err = find_block_mtd("\"rootfs\"", devpath, sizeof(devpath));
 #ifdef UBIFS_EXTROOT
-	if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
-		int err = -1;
+	if (err) {
 		libubi_t libubi;
 
 		libubi = libubi_open();
 		err = find_block_ubi_RO(libubi, "rootfs", devpath, sizeof(devpath));
 		libubi_close(libubi);
-		if (err)
-			return -1;
 	}
-#else
-	if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
-		if (find_root_dev(devpath, sizeof(devpath))) {
-			ULOG_ERR("extroot: unable to determine root device\n");
-			return -1;
+#endif
+	if (err) {
+		err = find_root_dev(devpath, sizeof(devpath));
+	}
+	if (err) {
+		ULOG_ERR("extroot: unable to determine root device\n");
+		return -1;
+	}
+
+	/* Find root device probe_info so we know its UUID */
+	list_for_each_entry(tmp, &devices, list) {
+		if (!strcmp(tmp->dev, devpath)) {
+			pr = tmp;
+			break;
 		}
 	}
-#endif
+	if (!pr) {
+		ULOG_ERR("extroot: unable to lookup root device %s\n", devpath);
+		return -1;
+	}
 
-	list_for_each_entry(pr, &devices, list) {
-		if (!strcmp(pr->dev, devpath)) {
-			struct stat s;
-			FILE *fp = NULL;
-			char tag[64];
-			char uuid[64] = { 0 };
-
-			snprintf(tag, sizeof(tag), "%s/etc", path);
-			if (stat(tag, &s))
-				mkdir_p(tag);
-
-			snprintf(tag, sizeof(tag), "%s/etc/.extroot-uuid", path);
-			if (stat(tag, &s)) {
-				fp = fopen(tag, "w+");
-				if (!fp) {
-					ULOG_ERR("extroot: failed to write UUID to %s: %d (%m)\n",
-					         tag, errno);
-					/* return 0 to continue boot regardless of error */
-					return 0;
-				}
-				fputs(pr->uuid, fp);
-				fclose(fp);
-				return 0;
-			}
+	snprintf(tag, sizeof(tag), "%s/etc", path);
+	if (stat(tag, &s))
+		mkdir_p(tag);
 
-			fp = fopen(tag, "r");
-			if (!fp) {
-				ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n",
-				         tag, errno);
-				return -1;
-			}
+	snprintf(tag, sizeof(tag), "%s/etc/.extroot-uuid", path);
+	if (stat(tag, &s)) {
+		fp = fopen(tag, "w+");
+		if (!fp) {
+			ULOG_ERR("extroot: failed to write UUID to %s: %d (%m)\n",
+				 tag, errno);
+			/* return 0 to continue boot regardless of error */
+			return 0;
+		}
+		fputs(pr->uuid, fp);
+		fclose(fp);
+		return 0;
+	}
 
-			if (!fgets(uuid, sizeof(uuid), fp))
-				ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n",
-				         tag, errno);
-			fclose(fp);
+	fp = fopen(tag, "r");
+	if (!fp) {
+		ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n", tag,
+			 errno);
+		return -1;
+	}
 
-			if (*uuid && !strcasecmp(uuid, pr->uuid))
-				return 0;
+	if (!fgets(uuid, sizeof(uuid), fp))
+		ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n", tag,
+			 errno);
+	fclose(fp);
 
-			ULOG_ERR("extroot: UUID mismatch (root: %s, %s: %s)\n",
-			         pr->uuid, basename(path), uuid);
-			return -1;
-		}
-	}
+	if (*uuid && !strcasecmp(uuid, pr->uuid))
+		return 0;
 
-	ULOG_ERR("extroot: unable to lookup root device %s\n", devpath);
+	ULOG_ERR("extroot: UUID mismatch (root: %s, %s: %s)\n", pr->uuid,
+		 basename(path), uuid);
 	return -1;
 }
 
@@ -1449,7 +1466,7 @@ static int mount_extroot(char *cfg)
 		ULOG_INFO("extroot: device not present, retrying in %u seconds\n", delay_root);
 		sleep(delay_root);
 		make_devs();
-		cache_load(0);
+		cache_load(1);
 		pr = find_block_info(m->uuid, m->label, m->device);
 	}
 	if (pr) {
@@ -1494,6 +1511,12 @@ static int mount_extroot(char *cfg)
 	return err;
 }
 
+/**
+ * Look for extroot config and mount it if present
+ *
+ * Look for /etc/config/fstab on all supported partitions and use it for
+ * mounting extroot if specified.
+ */
 static int main_extroot(int argc, char **argv)
 {
 	struct probe_info *pr;
@@ -1567,6 +1590,7 @@ static int main_extroot(int argc, char **argv)
        }
 #endif
 
+	/* As a last resort look for /etc/config/fstab on "rootfs" partition */
 	return mount_extroot(NULL);
 }
 
@@ -1589,6 +1613,7 @@ static int main_mount(int argc, char **argv)
 static int main_umount(int argc, char **argv)
 {
 	struct probe_info *pr;
+	bool all = false;
 
 	if (config_load(NULL))
 		return -1;
@@ -1596,6 +1621,10 @@ static int main_umount(int argc, char **argv)
 	handle_swapfiles(false);
 
 	cache_load(0);
+
+	if (argc == 3)
+		all = !strcmp(argv[2], "-a");
+
 	list_for_each_entry(pr, &devices, list) {
 		struct mount *m;
 
@@ -1606,7 +1635,7 @@ static int main_umount(int argc, char **argv)
 		if (m && m->extroot)
 			continue;
 
-		umount_device(pr->dev);
+		umount_device(pr->dev, TYPE_DEV, all);
 	}
 
 	return 0;
@@ -1717,7 +1746,6 @@ static int main_swapon(int argc, char **argv)
 		default:
 			return swapon_usage();
 		}
-
 	}
 
 	if (optind != (argc - 1))