summaryrefslogtreecommitdiff
path: root/src/fstab-generator/fstab-generator.c
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-03-26 15:33:57 +0100
committerHarald Hoyer <harald@redhat.com>2013-03-26 15:39:29 +0100
commita87586a17160f9a57fdc63604c48392cccb33454 (patch)
tree5b9fc1e638b1d998bd4dbc6ba845b8aa7ac4a156 /src/fstab-generator/fstab-generator.c
parent6a9280cc60b333817e22f0885b9c145e6252cc0b (diff)
fstab-generator: drop x-initrd.rootfs mount option
x-initrd.mount now has different meanings, if fstab-generator is called in the initramfs. initrd:/etc/fstab and x-initrd.mount defines mounts for the initrd-root-fs.target initrd:/sysroot/etc/fstab and x-initrd.mount defines mounts for the initrd-fs.target
Diffstat (limited to 'src/fstab-generator/fstab-generator.c')
-rw-r--r--src/fstab-generator/fstab-generator.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 25b5460f88..78d9ce90d7 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -199,12 +199,6 @@ static bool mount_in_initrd(struct mntent *me) {
streq(me->mnt_dir, "/usr");
}
-static bool mount_is_rootfs(struct mntent *me) {
- assert(me);
-
- return hasmntopt(me, "x-initrd.rootfs");
-}
-
static int add_mount(
const char *what,
const char *where,
@@ -458,7 +452,7 @@ static int parse_fstab(const char *prefix, bool initrd) {
post = SPECIAL_INITRD_FS_TARGET;
pre = NULL;
setup = NULL;
- } else if (mount_is_rootfs(me)) {
+ } else if (mount_in_initrd(me)) {
post = SPECIAL_INITRD_ROOT_FS_TARGET;
pre = NULL;
setup = NULL;