fstab-generator: rename x-initrd-rootfs.mount to x-initrd.rootfs

This changes the fstab mount option x-initrd-rootfs.mount to
x-initrd.rootfs, in order to only use a single namespace "x-initrd." for
all mount options of the initrd.

diff --git a/TODO b/TODO
index 646fad885aa1fdd5d6d3bb32d7b1465ef0c5851e..f218d182c30edbce465674408cfad828aaf2b550 100644 (file)
--- a/TODO
+++ b/TODO
@@ -59,8 +59,6 @@ Features:
 * introduce timers.target and paths.target and automatucally order all
   timers and paths before it and after sysinit.target.
 
-* x-initrd-rootfs.mount in fstab-generator needs to go or get a saner name
-
 * matching against units is currently broken in journalctl. We really
   need another AND level in the expressions,
   i.e. sd_journal_add_conjunction().

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index cf85d3189a9267ab8bcba5515e8cb8e8e27b6880..d5f9db49ca8b6016afd34bb5548070bad0ee5067 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -202,7 +202,7 @@ static bool mount_in_initrd(struct mntent *me) {
 static bool mount_is_rootfs(struct mntent *me) {
         assert(me);
 
-        return hasmntopt(me, "x-initrd-rootfs.mount");
+        return hasmntopt(me, "x-initrd.rootfs");
 }
 
 static int add_mount(const char *what, const char *where, const char *type, const char *opts,