Add -n and -N options to s6-l-i and s6-l-i-m

2 files changed, 39 insertions, 12 deletions

diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c
index 434e29f..1005811 100644
--- a/src/init/s6-linux-init-maker.c
+++ b/src/init/s6-linux-init-maker.c
@@ -28,12 +28,12 @@
 
 #ifdef S6_LINUX_INIT_UTMPD_PATH
 # include <utmps/config.h>
-# define USAGE "s6-linux-init-maker [ -c basedir ] [ -u log_user ] [ -G early_getty_cmd ] [ -1 ] [ -L ] [ -p initial_path ] [ -m initial_umask ] [ -t timestamp_style ] [ -d slashdev ] [ -s env_store ] [ -e initial_envvar ... ] [ -q default_grace_time ] [ -D initdefault ] [ -U utmp_user ] dir"
-# define OPTION_STRING "c:u:G:1Lp:m:t:d:s:e:E:q:U:D:"
+# define USAGE "s6-linux-init-maker [ -c basedir ] [ -u log_user ] [ -G early_getty_cmd ] [ -1 ] [ -L ] [ -p initial_path ] [ -m initial_umask ] [ -t timestamp_style ] [ -d slashdev ] [ -s env_store ] [ -e initial_envvar ... ] [ -q default_grace_time ] [ -D initdefault ] [ -n | -N ] [ -U utmp_user ] dir"
+# define OPTION_STRING "c:u:G:1Lp:m:t:d:s:e:E:q:D:nNU:"
 # define UTMPS_DIR "utmps"
 #else
-# define USAGE "s6-linux-init-maker [ -c basedir ] [ -u log_user ] [ -G early_getty_cmd ] [ -1 ] [ -L ] [ -p initial_path ] [ -m initial_umask ] [ -t timestamp_style ] [ -d slashdev ] [ -s env_store ] [ -e initial_envvar ... ] [ -q default_grace_time ] [ -D initdefault ] dir"
-# define OPTION_STRING "c:u:G:1Lp:m:t:d:s:e:E:q:D:"
+# define USAGE "s6-linux-init-maker [ -c basedir ] [ -u log_user ] [ -G early_getty_cmd ] [ -1 ] [ -L ] [ -p initial_path ] [ -m initial_umask ] [ -t timestamp_style ] [ -d slashdev ] [ -s env_store ] [ -e initial_envvar ... ] [ -q default_grace_time ] [ -D initdefault ] [ -n | -N ] dir"
+# define OPTION_STRING "c:u:G:1Lp:m:t:d:s:e:E:q:D:nN"
 #endif
 
 #define dieusage() strerr_dieusage(100, USAGE)
@@ -51,6 +51,7 @@ static char const *initdefault = 0 ;
 static unsigned int initial_umask = 0022 ;
 static unsigned int timestamp_style = 1 ;
 static unsigned int finalsleep = 3000 ;
+static int mounttype = 1 ;
 static int console = 0 ;
 static int logouthookd = 0 ;
 
@@ -233,6 +234,15 @@ static inline int stage1_script (buffer *b, char const *data)
     if (buffer_put(b, satmp.s + sabase, satmp.len - sabase) < 0) goto err ;
     satmp.len = sabase ;
   }
+  if (mounttype == 2)
+  {
+    if (buffer_puts(b, " -n") < 0) return 0 ;
+  }
+  else if (!mounttype)
+  {
+    if (buffer_puts(b, " -N") < 0) return 0 ;
+  }
+
   if (buffer_puts(b, "\n") < 0) return 0 ;
   (void)data ;
   return 1 ;
@@ -575,6 +585,8 @@ int main (int argc, char const *const *argv, char const *const *envp)
         case 'e' : if (!stralloc_catb(&satmp, l.arg, strlen(l.arg) + 1)) dienomem() ; break ;
         case 'q' : if (!uint0_scan(l.arg, &finalsleep)) dieusage() ; break ;
         case 'D' : initdefault = l.arg ; break ;
+        case 'n' : mounttype = 2 ; break ;
+        case 'N' : mounttype = 0 ; break ;
 #ifdef S6_LINUX_INIT_UTMPD_PATH
         case 'U' : utmp_user = l.arg ; break ;
 #endif
diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c
index b6113a9..e322fa4 100644
--- a/src/init/s6-linux-init.c
+++ b/src/init/s6-linux-init.c
@@ -23,7 +23,7 @@
 #include "defaults.h"
 #include "initctl.h"
 
-#define USAGE "s6-linux-init [ -c basedir ] [ -p initpath ] [ -s envdumpdir ] [ -m umask ] [ -d devtmpfs ] [ -D initdefault ]"
+#define USAGE "s6-linux-init [ -c basedir ] [ -p initpath ] [ -s envdumpdir ] [ -m umask ] [ -d devtmpfs ] [ -D initdefault ] [ -n | -N ]"
 #define dieusage() strerr_dieusage(100, USAGE)
 
 #define BANNER "\n  s6-linux-init version " S6_LINUX_INIT_VERSION "\n\n"
@@ -68,6 +68,7 @@ int main (int argc, char const **argv, char const *const *envp)
   char const *slashdev = 0 ;
   char const *envdumpdir = 0 ;
   char const *initdefault = "default" ;
+  int mounttype = 1 ;
   stralloc envmodifs = STRALLOC_ZERO ;
   PROG = "s6-linux-init" ;
 
@@ -82,7 +83,7 @@ int main (int argc, char const **argv, char const *const *envp)
     subgetopt_t l = SUBGETOPT_ZERO ;
     for (;;)
     {
-      int opt = subgetopt_r(argc, argv, "c:p:s:m:d:D:", &l) ;
+      int opt = subgetopt_r(argc, argv, "c:p:s:m:d:D:nN", &l) ;
       if (opt == -1) break ;
       switch (opt)
       {
@@ -92,6 +93,8 @@ int main (int argc, char const **argv, char const *const *envp)
         case 'm' : if (!uint0_oscan(l.arg, &mask)) dieusage() ; break ;
         case 'd' : slashdev = l.arg ; break ;
         case 'D' : initdefault = l.arg ; break ;
+        case 'n' : mounttype = 2 ; break ;
+        case 'N' : mounttype = 0 ; break ;
         default : dieusage() ;
       }
     }
@@ -121,14 +124,26 @@ int main (int argc, char const **argv, char const *const *envp)
      || fd_move(2, 0) == -1) return 111 ;
   }
   if (open("/dev/null", O_RDONLY)) strerr_diefu1sys(111, "open /dev/null") ;
-  
-  if (umount(S6_LINUX_INIT_TMPFS) == -1)
+
+  if (mounttype)
   {
-    if (errno != EINVAL)
-      strerr_warnwu1sys("umount " S6_LINUX_INIT_TMPFS) ;
+    if (mounttype == 2)
+    {
+      if (mount("tmpfs", S6_LINUX_INIT_TMPFS, "tmpfs", MS_REMOUNT | MS_NODEV | MS_NOSUID, "mode=0755") == -1)
+        strerr_diefu1sys(111, "remount " S6_LINUX_INIT_TMPFS) ;
+    }
+    else
+    {
+      if (umount(S6_LINUX_INIT_TMPFS) == -1)
+      {
+        if (errno != EINVAL)
+          strerr_warnwu1sys("umount " S6_LINUX_INIT_TMPFS) ;
+      }
+      if (mount("tmpfs", S6_LINUX_INIT_TMPFS, "tmpfs", MS_NODEV | MS_NOSUID, "mode=0755") == -1)
+        strerr_diefu1sys(111, "mount tmpfs on " S6_LINUX_INIT_TMPFS) ;
+    }
   }
-  if (mount("tmpfs", S6_LINUX_INIT_TMPFS, "tmpfs", MS_NODEV | MS_NOSUID, "mode=0755") == -1)
-    strerr_diefu1sys(111, "mount tmpfs on " S6_LINUX_INIT_TMPFS) ;
+
   {
     size_t dirlen = strlen(basedir) ;
     char fn[dirlen + 1 + (sizeof(RUNIMAGE) > sizeof(ENVSTAGE1) ? sizeof(RUNIMAGE) : sizeof(ENVSTAGE1))] ;