summaryrefslogtreecommitdiff
path: root/src/init
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-08-28 08:12:20 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-08-28 08:12:20 +0000
commitc29368d9e34fee0e2fe0fae2fdf2865580be4ae0 (patch)
tree066714d4ec6c52ea2bb450b0f84e7ffb9ebea0da /src/init
parent17c03cf8f0a6339d78ad8fb968ef3b999d658034 (diff)
downloads6-linux-init-c29368d9e34fee0e2fe0fae2fdf2865580be4ae0.tar.xz
Add namespaces support, prepare for 0.3.1.0
Diffstat (limited to 'src/init')
-rw-r--r--src/init/hpr.c63
-rw-r--r--src/init/s6-linux-init-maker.c48
2 files changed, 104 insertions, 7 deletions
diff --git a/src/init/hpr.c b/src/init/hpr.c
index faa0a7c..b587dba 100644
--- a/src/init/hpr.c
+++ b/src/init/hpr.c
@@ -1,13 +1,61 @@
/* ISC license. */
+#include <skalibs/sysdeps.h>
+#include <skalibs/nonposix.h>
#include <unistd.h>
#include <signal.h>
+#include <errno.h>
#include <sys/reboot.h>
#include <skalibs/strerr2.h>
#include <skalibs/sgetopt.h>
+#include <skalibs/sig.h>
+#include <skalibs/djbunix.h>
#define USAGE PROGNAME " [ -h | -p | -r ] [ -f ]"
+#ifdef SKALIBS_HASNSGETPARENT
+
+#include <sys/ioctl.h>
+#include <linux/nsfs.h>
+
+static int test_in_namespace (void)
+{
+ int r ;
+ int fd = open_read("/proc/1/ns/pid") ;
+ if (fd < 0) return 0 ;
+ r = ioctl(myfd, NS_GET_PARENT) ;
+ close(fd) ;
+ return r >= 0 ;
+}
+
+#else
+
+ /*
+ When in doubt, always trap signals. This incurs a small race:
+ if ctrl-alt-del is pressed at the wrong time, the process will
+ exit and cause a kernel panic. But the alternatives are WAY
+ more hackish than this.
+ */
+
+static int test_in_namespace (void)
+{
+ return 1 ;
+}
+
+#endif
+
+static void sigint_handler (int sig)
+{
+ (void)sig ;
+ _exit(1) ;
+}
+
+static void sighup_handler (int sig)
+{
+ (void)sig ;
+ _exit(0) ;
+}
+
int main (int argc, char const *const *argv)
{
int what = WHATDEFAULT ;
@@ -32,9 +80,24 @@ int main (int argc, char const *const *argv)
argc -= l.ind ; argv += l.ind ;
}
+ if (geteuid())
+ {
+ errno = EPERM ;
+ strerr_dief1sys(100, "nice try, peon") ;
+ }
+
if (force)
{
sync() ;
+ if (getpid() == 1)
+ {
+ if (test_in_namespace())
+ {
+ if (sig_catch(SIGINT, &sigint_handler) < 0
+ || sig_catch(SIGHUP, &sighup_handler) < 0)
+ strerr_diefu1sys(111, "catch signals") ;
+ }
+ }
reboot(what == 3 ? RB_AUTOBOOT : what == 2 ? RB_POWER_OFF : RB_HALT_SYSTEM) ;
strerr_diefu1sys(111, "reboot()") ;
}
diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c
index 802d924..2aa28da 100644
--- a/src/init/s6-linux-init-maker.c
+++ b/src/init/s6-linux-init-maker.c
@@ -16,11 +16,12 @@
#include <skalibs/sgetopt.h>
#include <skalibs/skamisc.h>
-#define USAGE "s6-linux-init-maker [ -c basedir ] [ -l tmpfsdir ] [ -b execline_bindir ] [ -u log_uid -g log_gid | -U ] [ -G early_getty_cmd ] [ -2 stage2_script ] [ -r ] [ -Z finish_script ] [ -3 stage3_script ] [ -p initial_path ] [ -m initial_umask ] [ -t timestamp_style ] [ -d dev_style ] [ -s env_store ] [ -e initial_envvar ... ] dir"
+#define USAGE "s6-linux-init-maker [ -c basedir ] [ -l tmpfsdir ] [ -b execline_bindir ] [ -u log_uid -g log_gid | -U ] [ -G early_getty_cmd ] [ -2 stage2_script ] [ -r ] [ -Z finish_script ] [ -3 stage3_script ] [ -p initial_path ] [ -m initial_umask ] [ -t timestamp_style ] [ -d dev_style ] [ -s env_store ] [ -e initial_envvar ... ] [ -n ] dir"
#define dieusage() strerr_dieusage(100, USAGE)
#define dienomem() strerr_diefu1sys(111, "stralloc_catb") ;
#define BANNER "\n init created by s6-linux-init-maker\n see http://skarnet.org/software/s6-linux-init/\n\n"
+#define EXITCODENAME "file\\ created\\ by\\ s6-linux-init,\\ storing\\ a\\ container's\\ exit\\ code"
#define CRASH_SCRIPT \
"redirfd -r 0 /dev/console\n" \
@@ -45,6 +46,7 @@ static unsigned int initial_umask = 022 ;
static unsigned int timestamp_style = 1 ;
static unsigned int slashdev_style = 2 ;
static int redirect_stage2 = 0 ;
+static int in_namespace = 0 ;
typedef int writetobuf_func_t (buffer *) ;
typedef writetobuf_func_t *writetobuf_func_t_ref ;
@@ -101,10 +103,22 @@ static int finish_script (buffer *b)
size_t sabase = satmp.len ;
if (buffer_puts(b, "#!") < 0
|| buffer_puts(b, bindir) < 0
- || buffer_puts(b, "/execlineb -S0\n\n"
- "cd /\nredirfd -w 2 /dev/console\nfdmove -c 1 2\nforeground { s6-svc -X -- ") < 0
+ || buffer_puts(b, "/execlineb -S0\n\n") < 0
|| !string_quote(&satmp, slashrun, strlen(slashrun))) return 0 ;
- if (buffer_put(b, satmp.s + sabase, satmp.len - sabase) < 0) goto err ;
+
+ if (in_namespace)
+ {
+ if (buffer_puts(b, "ifelse { redirfd -r 0 ") < 0
+ || buffer_put(b, satmp.s + sabase, satmp.len - sabase) < 0
+ || buffer_puts(b, "/" EXITCODENAME " exit 0 }\n{ redirfd -r 0 ") < 0
+ || buffer_put(b, satmp.s + sabase, satmp.len - sabase) < 0
+ || buffer_puts(b, "/" EXITCODENAME " withstdinas -in CODE foreground { s6-rmrf ") < 0
+ || buffer_put(b, satmp.s + sabase, satmp.len - sabase) < 0
+ || buffer_puts(b, "/" EXITCODENAME " } importas -ui CODE CODE exit ${CODE} }\n") < 0) goto err ;
+ }
+
+ if (buffer_puts(b, "cd /\nredirfd -w 2 /dev/console\nfdmove -c 1 2\nforeground { s6-svc -X -- ") < 0
+ || buffer_put(b, satmp.s + sabase, satmp.len - sabase) < 0) goto err ;
satmp.len = sabase ;
if (buffer_puts(b, "/service/s6-svscan-log }\nunexport ?\nwait -r -- { }\n") < 0
|| !string_quote(&satmp, shutdown_script, strlen(shutdown_script))) return 0 ;
@@ -138,6 +152,25 @@ static int sig_script (buffer *b, char c)
return 0 ;
}
+static int onlyexit (buffer *b, char c)
+{
+ size_t sabase = satmp.len ;
+ if (!put_shebang(b)
+ || buffer_puts(b, "foreground { redirfd -w 1 ") < 0
+ || !string_quote(&satmp, slashrun, strlen(slashrun))
+ || buffer_put(b, satmp.s + sabase, satmp.len - sabase) < 0
+ || buffer_puts(b, "/" EXITCODENAME " s6-echo -- ") < 0
+ || buffer_put(b, &c, 1) < 0
+ || buffer_puts(b, " }\ns6-svscanctl -b ") < 0
+ || buffer_put(b, satmp.s + sabase, satmp.len - sabase) < 0
+ || buffer_puts(b, "/service\n") < 0) goto err ;
+ satmp.len = sabase ;
+ return 1 ;
+ err:
+ satmp.len = sabase ;
+ return 0 ;
+}
+
static int sigterm_script (buffer *b)
{
return sig_script(b, 't') ;
@@ -145,7 +178,7 @@ static int sigterm_script (buffer *b)
static int sighup_script (buffer *b)
{
- return sig_script(b, 'h') ;
+ return in_namespace ? onlyexit(b, '0') : sig_script(b, 'h') ;
}
static int sigquit_script (buffer *b)
@@ -155,7 +188,7 @@ static int sigquit_script (buffer *b)
static int sigint_script (buffer *b)
{
- return sig_script(b, '6') ;
+ return in_namespace ? onlyexit(b, '1') : sig_script(b, '6') ;
}
static int sigusr1_script (buffer *b)
@@ -361,7 +394,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
{
- int opt = subgetopt_r(argc, argv, "c:l:b:u:g:UG:2:rZ:3:p:m:t:d:s:e:", &l) ;
+ int opt = subgetopt_r(argc, argv, "c:l:b:u:g:UG:2:rZ:3:p:m:t:d:s:e:n", &l) ;
if (opt == -1) break ;
switch (opt)
{
@@ -390,6 +423,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
case 'd' : if (!uint0_scan(l.arg, &slashdev_style)) dieusage() ; break ;
case 's' : env_store = l.arg ; break ;
case 'e' : if (!stralloc_catb(&satmp, l.arg, strlen(l.arg) + 1)) dienomem() ; break ;
+ case 'n' : in_namespace = 1 ; break ;
default : dieusage() ;
}
}