4:57 a.m.
In old versions of supermin, we picked the last device as the root
device. Since 2012, libguestfs has passed the correct device to use
in the root= parameter, and this was supported by supermin (actually,
febootstrap!) >= 3.15.
This change requires the root= parameter to be passed, and supermin
will fail with an error otherwise.
---
init/init.c | 97 +++++++++++++++++++++++--------------------------------------
1 file changed, 37 insertions(+), 60 deletions(-)
diff --git a/init/init.c b/init/init.c
index 46325b4..e3d1107 100644
--- a/init/init.c
+++ b/init/init.c
@@ -154,76 +154,53 @@ main ()
}
fclose (fp);
- /* Look for the ext2 filesystem device. It's always the last one
- * that was added. Modern versions of libguestfs supply the
- * expected name of the root device on the command line
- * ("root=/dev/..."). For virtio-scsi this is required, because we
- * must wait for the device to appear after the module is loaded.
+ /* Look for the ext2 filesystem root device specified as root=...
+ * on the kernel command line.
*/
char *root, *path;
size_t len;
int dax = 0;
root = strstr (cmdline, "root=");
- if (root) {
- root += 5;
- if (strncmp (root, "/dev/", 5) == 0)
- root += 5;
- if (strncmp (root, "pmem", 4) == 0)
- dax = 1;
- len = strcspn (root, " ");
- root[len] = '\0';
-
- asprintf (&path, "/sys/block/%s/dev", root);
-
- uint64_t delay_ns = 250000;
- int virtio_message = 0;
- while (delay_ns <= MAX_ROOT_WAIT * UINT64_C(1000000000)) {
- fp = fopen (path, "r");
- if (fp != NULL)
- goto found;
-
- if (delay_ns > 1000000000) {
- fprintf (stderr,
- "supermin: waiting another %" PRIu64 " ns for %s to appear\n",
- delay_ns, path);
- if (!virtio_message) {
- fprintf (stderr,
- "This usually means your kernel doesn't support virtio, or
supermin was unable\n"
- "to load some kernel modules (see module loading messages
above).\n");
- virtio_message = 1;
- }
- }
-
- struct timespec t;
- t.tv_sec = delay_ns / 1000000000;
- t.tv_nsec = delay_ns % 1000000000;
- nanosleep (&t, NULL);
- delay_ns *= 2;
- }
+ if (!root) {
+ fprintf (stderr, "supermin: missing root= parameter on the command
line\n");
+ exit (EXIT_FAILURE);
}
- else {
- path = strdup ("/sys/block/xdx/dev");
-
- char class[3] = { 'v', 's', 'h' };
- size_t i, j;
- fp = NULL;
- for (i = 0; i < sizeof class; ++i) {
- for (j = 'z'; j >= 'a'; --j) {
- path[11] = class[i];
- path[13] = j;
- fp = fopen (path, "r");
- if (fp != NULL)
- goto found;
+ root += 5;
+ if (strncmp (root, "/dev/", 5) == 0)
+ root += 5;
+ if (strncmp (root, "pmem", 4) == 0)
+ dax = 1;
+ len = strcspn (root, " ");
+ root[len] = '\0';
+
+ asprintf (&path, "/sys/block/%s/dev", root);
+
+ uint64_t delay_ns = 250000;
+ int virtio_message = 0;
+ while (delay_ns <= MAX_ROOT_WAIT * UINT64_C(1000000000)) {
+ fp = fopen (path, "r");
+ if (fp != NULL)
+ break;
+
+ if (delay_ns > 1000000000) {
+ fprintf (stderr,
+ "supermin: waiting another %" PRIu64 " ns for %s to
appear\n",
+ delay_ns, path);
+ if (!virtio_message) {
+ fprintf (stderr,
+ "This usually means your kernel doesn't support virtio, or
supermin was unable\n"
+ "to load some kernel modules (see module loading messages
above).\n");
+ virtio_message = 1;
}
}
- }
- fprintf (stderr,
- "supermin: no ext2 root device found\n"
- "Please include FULL verbose output in your bug report.\n");
- exit (EXIT_FAILURE);
+ struct timespec t;
+ t.tv_sec = delay_ns / 1000000000;
+ t.tv_nsec = delay_ns % 1000000000;
+ nanosleep (&t, NULL);
+ delay_ns *= 2;
+ }
- found:
if (!quiet)
fprintf (stderr, "supermin: picked %s as root device\n", path);
--
2.12.0