ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <ncopa@alpinelinux.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-11-06 12:50:27 +01:00
parent 9cf4f90911
commit 8f806bb1ea
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/statfs_magic.h
View File

@ -1,6 +1,17 @@
#ifndef UTIL_LINUX_STATFS_MAGIC_H
#define UTIL_LINUX_STATFS_MAGIC_H
#include <sys/statfs.h>
/*
* If possible then don't depend on internal libc __SWORD_TYPE type.
*/
#ifdef __GNUC__
typedef __typeof__( ((struct statfs *)0)->f_type ) ul_statfs_ftype_t;
#else
typedef __SWORD_TYPE ul_statfs_ftype_t;
#endif
/*
* Unfortunately, Linux kernel hedeader file <linux/magic.h> is incomplete
* mess and kernel returns by statfs f_type many numbers that are nowhere

4
sys-utils/switch_root.c
View File

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