X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=devices%2Fudev-helper.c;h=84b2bef95947cd16ea70ce5d311998f250ff5bd9;hp=6a9a42bac12e9c626e1c768dd7664edf759ac74c;hb=167387fd92cc204a38bc0afa75b66889dec3decf;hpb=6ce15c4265d3813ee311756ec03c6e4da74c1dbd

diff --git a/devices/udev-helper.c b/devices/udev-helper.c
index 6a9a42b..84b2bef 100644
--- a/devices/udev-helper.c
+++ b/devices/udev-helper.c
@@ -401,6 +401,18 @@ static int is_removable_device(const char *sysfs_path)
 	return strtol(buf, NULL, 10);
 }
 
+static int is_ignored_device(const char *devname)
+{
+	static const char *ignored_devices[] = { "/dev/ram", NULL };
+	const char **dev;
+
+	for (dev = ignored_devices; *dev; dev++)
+		if (!strncmp(devname, *dev, strlen(*dev)))
+			return 1;
+
+	return 0;
+}
+
 static int found_new_device(const char *dev_path)
 {
 	char mountpoint[PATH_MAX];
@@ -417,6 +429,31 @@ static int found_new_device(const char *dev_path)
 	return EXIT_SUCCESS;
 }
 
+static void detach_and_sleep(int sec)
+{
+	static int forked = 0;
+	int rc = 0;
+
+	if (sec <= 0)
+		return;
+
+	if (!forked) {
+		log("running in background...");
+		rc = fork();
+		forked = 1;
+	}
+
+	if (rc == 0) {
+		sleep(sec);
+
+	} else if (rc == -1) {
+		perror("fork()");
+		exit(EXIT_FAILURE);
+	} else {
+		exit(EXIT_SUCCESS);
+	}
+}
+
 static int poll_device_plug(const char *dev_path,
 			    int *optical)
 {
@@ -439,7 +476,7 @@ static int poll_device_plug(const char *dev_path,
 			return EXIT_SUCCESS;
 
 		printf("no... waiting\n");
-		sleep(REMOVABLE_SLEEP_DELAY);
+		detach_and_sleep(REMOVABLE_SLEEP_DELAY);
 	}
 
 	/* Fall back to bare open() */
@@ -453,7 +490,7 @@ static int poll_device_plug(const char *dev_path,
 		if (fd >= 0)
 			return EXIT_SUCCESS;
 		printf("no... waiting\n");
-		sleep(REMOVABLE_SLEEP_DELAY);
+		detach_and_sleep(REMOVABLE_SLEEP_DELAY);
 	}
 }
 
@@ -471,7 +508,7 @@ static int poll_device_unplug(const char *dev_path, int optical)
 		if (rc != CDS_DISC_OK)
 			return EXIT_SUCCESS;
 		printf("no... waiting\n");
-		sleep(REMOVABLE_SLEEP_DELAY);
+		detach_and_sleep(REMOVABLE_SLEEP_DELAY);
 	}
 
 	/* Fall back to bare open() */
@@ -484,7 +521,7 @@ static int poll_device_unplug(const char *dev_path, int optical)
 		if (fd < 0)
 			return EXIT_SUCCESS;
 		printf("no... waiting\n");
-		sleep(REMOVABLE_SLEEP_DELAY);
+		detach_and_sleep(REMOVABLE_SLEEP_DELAY);
 	}
 }
 
@@ -507,7 +544,7 @@ static int poll_removable_device(const char *sysfs_path,
 		/* Unmount it repeatedly, if needs be */
 		while (mounted && !unmount_device(dev_path))
 			;
-		sleep(1);
+		detach_and_sleep(1);
 	}
 }
 
@@ -516,9 +553,6 @@ int main(int argc, char **argv)
 	char *dev_path, *action;
 	int rc;
 
-	/*if (fork())
-		return EXIT_SUCCESS;
-		*/
 	action = getenv("ACTION");
 
 	logf = stdout;
@@ -551,6 +585,9 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
+	if (is_ignored_device(dev_path))
+		return EXIT_SUCCESS;
+
 	if (streq(action, "add")) {
 		char *sysfs_path = getenv("DEVPATH");
 		if (sysfs_path && is_removable_device(sysfs_path))