From 8cf163db4ff9bc61334cd0c3ed53fabe13dd2587 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 29 Nov 2018 15:44:09 +0100 Subject: check for builtin modules in /sys/fs too eg: ext4 is builtin but appears in /sys/fs, not in /sys/modules Alternatively we could have looked at /proc/filesytem contents like stage2 Thus we've better readable stage1 logs --- mdk-stage1/NEWS | 1 + mdk-stage1/modules.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 746e8fe63..5cfc473c4 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,4 +1,5 @@ - advertize "ext4" rather than "ext2" +- check for builtin modules in /sys/fs too (eg: ext4) 2.32 diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c index 5b470269e..76177302e 100644 --- a/mdk-stage1/modules.c +++ b/mdk-stage1/modules.c @@ -221,6 +221,12 @@ int module_already_present(const char * name) answ = 1; free(path); } + if (!answ) { + asprintf(&path, "/sys/fs/%s", name); + if (!stat(path, &sb)) + answ = 1; + free(path); + } return answ; } -- cgit v1.2.1