shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

fstab-generator: drop x-initrd.rootfs mount option

Browse Source 
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
This commit is contained in:
Harald Hoyer 2013-03-26 15:33:57 +01:00
parent 6a9280cc60
commit a87586a171
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fstab-generator/fstab-generator.c
View File

@ -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;