From 97edebfacd8be1163a1ad285ddcfcf843f1a46de Mon Sep 17 00:00:00 2001 From: "Pranay Kr. Srivastava" Date: Mon, 24 Aug 2020 13:40:02 +0530 Subject: [PATCH] Check only rootfs as filesystem type When detecting if rootfs is on ramfs instead of checking "- rootfs rootfs" which is the " - " information only check the file system type. This is due to a change introduced in kernel where ramfs file system doesn't set the device to "rootfs" but instead mark it as "none". By making sure we only check for "rootfs" as the file system name we also offer backward compatibility with earlier kernels as well. The kernel commit that introduced this change was commit f32356261d44d580649a7abce1156d15d49cf20f Author: David Howells Date: Mon Mar 25 16:38:31 2019 +0000 vfs: Convert ramfs, shmem, tmpfs, devtmpfs, rootfs to use the new mount API Signed-off-by: Pranay Kr. Srivastava --- src/lxc/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/utils.c b/src/lxc/utils.c index 9971aed16..c02eef152 100644 --- a/src/lxc/utils.c +++ b/src/lxc/utils.c @@ -704,7 +704,7 @@ bool detect_ramfs_rootfs(void) if (strcmp(p + 1, "/") == 0) { /* This is '/'. Is it the ramfs? */ p = strchr(p2 + 1, '-'); - if (p && strncmp(p, "- rootfs rootfs ", 16) == 0) + if (p && strncmp(p, "- rootfs ", 9) == 0) return true; } } -- 2.47.2