summaryrefslogtreecommitdiff
path: root/src/init
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-02-26 13:46:42 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-02-26 13:46:42 +0000
commiteb5b5d843d4584f6e3548b1de069126deb3edb69 (patch)
treee52c0f755956d4e0a8a2fa46cf588836152b7386 /src/init
parent723220f5e6ca72a43a795f88f9282e81749ace3f (diff)
downloads6-linux-init-eb5b5d843d4584f6e3548b1de069126deb3edb69.tar.xz
Tentative support for kbrequest
Diffstat (limited to 'src/init')
-rw-r--r--src/init/s6-linux-init-maker.c3
-rw-r--r--src/init/s6-linux-init.c42
2 files changed, 37 insertions, 8 deletions
diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c
index 27ac0c4..33c9b51 100644
--- a/src/init/s6-linux-init-maker.c
+++ b/src/init/s6-linux-init-maker.c
@@ -65,7 +65,7 @@ static char const *utmp_user = "utmp" ;
typedef int writetobuf_func_t (buffer *, char const *) ;
typedef writetobuf_func_t *writetobuf_func_t_ref ;
-#define put_shebang(b) put_shebang_options((b), "-P")
+#define put_shebang(b) put_shebang_options((b), 0)
static int put_shebang_options (buffer *b, char const *options)
{
@@ -549,6 +549,7 @@ static inline void make_image (char const *base)
auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGUSR1", &sig_script, "-p") ;
auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGUSR2", &sig_script, "-h") ;
auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGPWR", &sig_script, "-p") ;
+ auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGWINCH", &put_shebang_options, 0) ;
if (!nologger)
{
diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c
index 530093e..10faa70 100644
--- a/src/init/s6-linux-init.c
+++ b/src/init/s6-linux-init.c
@@ -5,15 +5,21 @@
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
+#include <signal.h>
#include <sys/stat.h>
#include <sys/mount.h>
#include <sys/reboot.h>
+#include <sys/ioctl.h>
+#include <linux/kd.h>
+
+#include <skalibs/sysdeps.h>
#include <skalibs/types.h>
#include <skalibs/allreadwrite.h>
#include <skalibs/sgetopt.h>
#include <skalibs/strerr2.h>
#include <skalibs/stralloc.h>
+#include <skalibs/sig.h>
#include <skalibs/env.h>
#include <skalibs/djbunix.h>
@@ -61,13 +67,29 @@ static inline void wait_for_notif (int fd)
close(fd) ;
}
-static void disablecad (void)
+static void kbspecials (int dokbr)
{
- if (!inns)
+ if (inns) return ;
+
+ /* second attempt to handle kbr: after we have our /dev for certain */
+ if (dokbr)
{
- if (reboot(RB_DISABLE_CAD) == -1)
- strerr_warnwu1sys("trap ctrl-alt-del") ;
+ int fd = open("/dev/tty0", O_RDONLY | O_NOCTTY) ;
+ if (fd < 0)
+ strerr_warnwu2sys("open /dev/", "tty0 (kbrequest will not be handled)") ;
+ else
+ {
+ if (ioctl(fd, KDSIGACCEPT, SIGWINCH) < 0)
+ strerr_warnwu2sys("ioctl KDSIGACCEPT on ", "tty0 (kbrequest will not be handled)") ;
+ close(fd) ;
+ }
}
+
+#ifdef SKALIBS_HASSIGNALFD
+ sig_block(SIGINT) ; /* eliminate the tiny race */
+#endif
+ if (reboot(RB_DISABLE_CAD) == -1)
+ strerr_warnwu1sys("trap ctrl-alt-del") ;
}
static inline void run_stage2 (char const *basedir, char const **argv, unsigned int argc, char const *const *envp, size_t envlen, char const *modifs, size_t modiflen, char const *initdefault)
@@ -110,6 +132,7 @@ int main (int argc, char const **argv, char const *const *envp)
char const *envdumpdir = 0 ;
char const *initdefault = "default" ;
int mounttype = 1 ;
+ int dokbr = 1 ;
stralloc envmodifs = STRALLOC_ZERO ;
PROG = "s6-linux-init" ;
@@ -157,7 +180,12 @@ int main (int argc, char const **argv, char const *const *envp)
close(3) ;
}
}
- else allwrite(1, BANNER, sizeof(BANNER) - 1) ;
+ else
+ {
+ allwrite(1, BANNER, sizeof(BANNER) - 1) ;
+ /* first attempt to handle kbr: before closing stdin */
+ if (ioctl(0, KDSIGACCEPT, SIGWINCH) == 0) dokbr = 0 ;
+ }
if (chdir("/") == -1) strerr_diefu1sys(111, "chdir to /") ;
umask(mask) ;
setpgid(0, 0) ;
@@ -257,7 +285,7 @@ int main (int argc, char const **argv, char const *const *envp)
close(notifpipe[0]) ;
fmtfd[1] = 'd' ;
fmtfd[2 + uint_fmt(fmtfd + 2, notifpipe[1])] = 0 ;
- disablecad() ;
+ kbspecials(dokbr) ;
}
else
{
@@ -265,7 +293,7 @@ int main (int argc, char const **argv, char const *const *envp)
if (fd < 0) strerr_diefu1sys(111, "dup stderr") ;
fmtfd[1] = 'X' ;
fmtfd[2 + uint_fmt(fmtfd + 2, (unsigned int)fd)] = 0 ;
- disablecad() ;
+ kbspecials(dokbr) ;
if (fd_copy(2, 1) == -1)
strerr_diefu1sys(111, "redirect output file descriptor") ;
}