From 790838e4f16831f2bb06aeb845b9e2fb0f1d28dd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 25 Mar 2013 18:18:09 +0100 Subject: [PATCH] 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. --- TODO | 2 -- src/fstab-generator/fstab-generator.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/TODO b/TODO index 646fad885..f218d182c 100644 --- 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 cf85d3189..d5f9db49c 100644 --- 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, -- 2.30.2