Page MenuHomeFreeBSD
Files F157890320

D15330.id42212.diff
No OneTemporary
Actions

D15330.id42212.diff
View Options

Index: usr.sbin/jail/command.c
===================================================================
--- usr.sbin/jail/command.c
+++ usr.sbin/jail/command.c
@@ -145,8 +145,8 @@
}
if (j->comstring == NULL || j->comstring->len == 0 ||
(create_failed && (comparam == IP_EXEC_PRESTART ||
- comparam == IP_EXEC_START || comparam == IP_COMMAND ||
- comparam == IP_EXEC_POSTSTART)))
+ comparam == IP_EXEC_STARTED || comparam == IP_EXEC_START ||
+ comparam == IP_COMMAND || comparam == IP_EXEC_POSTSTART)))
continue;
switch (run_command(j)) {
case -1:
Index: usr.sbin/jail/config.c
===================================================================
--- usr.sbin/jail/config.c
+++ usr.sbin/jail/config.c
@@ -71,6 +71,7 @@
[IP_EXEC_POSTSTOP] = {"exec.poststop", PF_INTERNAL},
[IP_EXEC_PRESTART] = {"exec.prestart", PF_INTERNAL},
[IP_EXEC_PRESTOP] = {"exec.prestop", PF_INTERNAL},
+ [IP_EXEC_STARTED] = {"exec.started", PF_INTERNAL},
[IP_EXEC_START] = {"exec.start", PF_INTERNAL},
[IP_EXEC_STOP] = {"exec.stop", PF_INTERNAL},
[IP_EXEC_SYSTEM_JAIL_USER]= {"exec.system_jail_user",
Index: usr.sbin/jail/jail.c
===================================================================
--- usr.sbin/jail/jail.c
+++ usr.sbin/jail/jail.c
@@ -96,6 +96,7 @@
IP_MOUNT_PROCFS,
IP_EXEC_PRESTART,
IP__OP,
+ IP_EXEC_STARTED,
IP_VNET_INTERFACE,
IP_EXEC_START,
IP_COMMAND,
Index: usr.sbin/jail/jailp.h
===================================================================
--- usr.sbin/jail/jailp.h
+++ usr.sbin/jail/jailp.h
@@ -86,6 +86,7 @@
IP_EXEC_POSTSTOP, /* Commands run outside jail after removing */
IP_EXEC_PRESTART, /* Commands run outside jail before creating */
IP_EXEC_PRESTOP, /* Commands run outside jail before removing */
+ IP_EXEC_STARTED, /* Commands run outside jail right after it was started */
IP_EXEC_START, /* Commands run inside jail on creation */
IP_EXEC_STOP, /* Commands run inside jail on removal */
IP_EXEC_SYSTEM_JAIL_USER,/* Get jail_user from system passwd file */

File Metadata

Mime Type
text/plain
Expires
Wed, May 27, 5:22 AM (7 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33547397
Default Alt Text
D15330.id42212.diff (2 KB)

Event Timeline