sulogin: fix includes

* support --enable-sulogin-emergency-mount on Linux only

* don't include unnecessary linux/magic.h

* don't include linux/fs.h, sys/mount.h should be enough, otherwise
  define a fallback for MS_RELATIME

Reported-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/configure.ac b/configure.ac
index 49594143dbaf9a2cf5379005edfa821dc1fd332f..2de674be751bb90319eac3358f5cfe688ea2449e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2596,6 +2596,8 @@ AC_ARG_ENABLE([sulogin-emergency-mount],
 )
 
 AS_IF([test "x$enable_sulogin_emergency_mount" = xyes], [
+  AS_IF([test "x$linux_os" = xyes], [ ],
+       [AC_MSG_ERROR([--enable-sulogin-emergency-mount selected for non-linux system])])
   AC_DEFINE([USE_SULOGIN_EMERGENCY_MOUNT], [1],
            [Should sulogin use an emergency mount of /dev and /proc?])
 ])

diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
index facb1ffbbd174f0d0945e7b3887c73591194e9b0..d2a5d5bea6c5b31edc45b81c3d9e87078beee307 100644 (file)
--- a/login-utils/sulogin-consoles.c
+++ b/login-utils/sulogin-consoles.c
@@ -41,10 +41,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#ifdef USE_SULOGIN_EMERGENCY_MOUNT
+#if defined(USE_SULOGIN_EMERGENCY_MOUNT)
 # include <sys/mount.h>
-# include <linux/fs.h>
-# include <linux/magic.h>
+# ifndef MS_RELATIME
+#  define MS_RELATIME  (1<<21)
+# endif
 # ifndef MNT_DETACH
 #  define MNT_DETACH   2
 # endif