system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Make it possible for init to execute any executable, not just sh(1)

Browse source 
scripts. This means one should be able to eg rewrite their /etc/rc
in Python.

Reviewed by:	kib
MFC after:	2 weeks
Relnotes:	yes
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D16565
This commit is contained in:
Edward Tomasz Napierala 2018-08-04 14:52:32 +00:00
parent 3848ff5cac
commit 37ac37f90c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=337321
1 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sbin/init/init.c
View file

@ -1057,7 +1057,7 @@ static state_func_t
run_script(const char *script)
{
pid_t pid, wpid;
int status;
int error, status;
char *argv[4];
const char *shell;
struct sigaction sa;
@ -1086,6 +1086,21 @@ run_script(const char *script)
#ifdef LOGIN_CAP
setprocresources(RESOURCE_RC);
#endif
/*
* Try to directly execute the script first. If it
* fails, try the old method of passing the script path
* to sh(1). Don't complain if it fails because of
* the missing execute bit.
*/
error = access(script, X_OK);
if (error == 0) {
execv(script, argv + 1);
warning("can't exec %s: %m", script);
} else if (errno != EACCES) {
warning("can't access %s: %m", script);
}
execv(shell, argv);
stall("can't exec %s for %s: %m", shell, script);
_exit(1); /* force single user mode */
@ -1854,7 +1869,7 @@ static int
runshutdown(void)
{
pid_t pid, wpid;
int status;
int error, status;
int shutdowntimeout;
size_t len;
char *argv[4];
@ -1897,6 +1912,21 @@ runshutdown(void)
#ifdef LOGIN_CAP
setprocresources(RESOURCE_RC);
#endif
/*
* Try to directly execute the script first. If it
* fails, try the old method of passing the script path
* to sh(1). Don't complain if it fails because of
* the missing execute bit.
*/
error = access(_path_rundown, X_OK);
if (error == 0) {
execv(_path_rundown, argv + 1);
warning("can't exec %s: %m", _path_rundown);
} else if (errno != EACCES) {
warning("can't access %s: %m", _path_rundown);
}
execv(shell, argv);
warning("can't exec %s for %s: %m", shell, _PATH_RUNDOWN);
_exit(1); /* force single user mode */