diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | doc/upgrade.html | 7 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/init/s6-linux-init.c | 4 |
6 files changed, 21 insertions, 6 deletions
@@ -6,9 +6,7 @@ /config.mak /src/include/s6-linux-init/config.h /s6-linux-init -/s6-linux-init-halt -/s6-linux-init-poweroff -/s6-linux-init-reboot +/s6-linux-init-hpr /s6-linux-init-shutdown /s6-linux-init-shutdownd /s6-linux-init-telinit @@ -1,5 +1,13 @@ Changelog for s6-linux-init. +In 1.0.3.0 +---------- + + - s6-linux-init now activates ctrl-alt-del management by +default (no need to manually configure it via sysctl in stage 2 +anymore.) + + In 1.0.2.1 ---------- diff --git a/doc/index.html b/doc/index.html index 1323daf..4a2dcea 100644 --- a/doc/index.html +++ b/doc/index.html @@ -110,7 +110,7 @@ all the other packages against the <em>static</em> version of libskarnet. <ul> <li> The current released version of s6-linux-init is -<a href="s6-linux-init-1.0.2.1.tar.gz">1.0.2.1</a>. </li> +<a href="s6-linux-init-1.0.3.0.tar.gz">1.0.3.0</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-init/">s6-linux-init git repository</a>: diff --git a/doc/upgrade.html b/doc/upgrade.html index 3ccf56f..98a1bc0 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,13 @@ <h1> What has changed in s6-linux-init </h1> +<h2> in 1.0.3.0 </h2> + +<ul> + <li> Ctrl-Alt-Del management is now activated by default, instead +of requiring a sysctl setting in stage 2. </li> +</ul> + <h2> in 1.0.2.1 </h2> <ul> diff --git a/package/info b/package/info index 69dae7c..f180d42 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-linux-init -version=1.0.2.1 +version=1.0.3.0 category=admin package_macro_name=S6_LINUX_INIT diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c index 75c9eee..78cf3d0 100644 --- a/src/init/s6-linux-init.c +++ b/src/init/s6-linux-init.c @@ -7,6 +7,7 @@ #include <errno.h> #include <sys/stat.h> #include <sys/mount.h> +#include <sys/reboot.h> #include <skalibs/types.h> #include <skalibs/allreadwrite.h> @@ -19,7 +20,6 @@ #include <s6/config.h> #include <s6-linux-init/config.h> - #include "defaults.h" #include "initctl.h" @@ -181,6 +181,8 @@ int main (int argc, char const **argv, char const *const *envp) pid = fork() ; if (pid == -1) strerr_diefu1sys(111, "fork") ; if (!pid) run_stage2(basedir, argv, argc, newenvp, !!path, envmodifs.s, envmodifs.len, initdefault) ; + if (reboot(RB_DISABLE_CAD) == -1) + strerr_warnwu1sys("trap ctrl-alt-del") ; if (fd_copy(2, 1) == -1) strerr_diefu1sys(111, "redirect output file descriptor") ; xpathexec_r(newargv, newenvp, !!path, envmodifs.s, envmodifs.len) ; |