From 8f806bb1ea30f15db7ca36d1cfa79349f8115302 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 6 Nov 2014 12:50:27 +0100 Subject: switch_root: improve statfs->f_type portability __SWORD_TYPE is not available everywhere, for example it's not defined by musl libc. It also seems that __SWORD_TYPE is not used for f_type on some architectures (s390x). Reported-by: Natanael Copa Signed-off-by: Karel Zak --- sys-utils/switch_root.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys-utils/switch_root.c') diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c index 6822a5d0c..c6a2eff8e 100644 --- a/sys-utils/switch_root.c +++ b/sys-utils/switch_root.c @@ -181,8 +181,8 @@ static int switchroot(const char *newroot) if (pid <= 0) { struct statfs stfs; if (fstatfs(cfd, &stfs) == 0 && - (stfs.f_type == (__SWORD_TYPE)STATFS_RAMFS_MAGIC || - stfs.f_type == (__SWORD_TYPE)STATFS_TMPFS_MAGIC)) + (stfs.f_type == (ul_statfs_ftype_t) STATFS_RAMFS_MAGIC || + stfs.f_type == (ul_statfs_ftype_t) STATFS_TMPFS_MAGIC)) recursiveRemove(cfd); else warn(_("old root filesystem is not an initramfs")); -- cgit v1.2.3-55-g7522