Page MenuHomeFreeBSD
Files F168976402

D59032.id184443.diff
No OneTemporary
Actions

D59032.id184443.diff
View Options

diff --git a/share/examples/jails/jail.xxx.conf b/share/examples/jails/jail.xxx.conf
--- a/share/examples/jails/jail.xxx.conf
+++ b/share/examples/jails/jail.xxx.conf
@@ -1,7 +1,7 @@
xxx {
host.hostname = "xxx.yyy"; # hostname
- path = "/vm/xxx"; # root directory
+ path = "/vm/$name"; # root directory
exec.clean;
exec.system_user = "root";
@@ -12,24 +12,24 @@
#
vnet;
# netgraph
- vnet.interface = "ng0_xxx"; # vnet interface(s)
- exec.prestart += "jng bridge xxx em0"; # bridge interface(s)
- exec.prestop += "ifconfig ng0_xxx -vnet xxx"; # return ifnet(s)
- exec.poststop += "jng shutdown xxx"; # destroy interface(s)
+ vnet.interface = "ng0_$name"; # vnet interface(s)
+ exec.prestart += "jng bridge $name em0"; # bridge interface(s)
+ exec.prestop += "ifconfig ng0_$name -vnet $name"; # return ifnet(s)
+ exec.poststop += "jng shutdown $name"; # destroy interface(s)
# if_bridge
- #vnet.interface = "e0b_xxx"; # vnet interface(s)
- #exec.prestart += "jib addm xxx em0"; # bridge interface(s)
- #exec.poststop += "jib destroy xxx"; # destroy interface(s)
+ #vnet.interface = "e0b_$name"; # vnet interface(s)
+ #exec.prestart += "jib addm $name em0"; # bridge interface(s)
+ #exec.poststop += "jib destroy $name"; # destroy interface(s)
# Standard recipe
exec.start += "/bin/sh /etc/rc";
exec.stop = "/bin/sh /etc/rc.shutdown jail";
- exec.consolelog = "/var/log/jail_xxx_console.log";
+ exec.consolelog = "/var/log/jail_${name}_console.log";
mount.devfs; # mount devfs
# Optional (default off)
#devfs_ruleset = "11"; # rule to unhide bpf for DHCP
- #allow.mount; # mount /etc/fstab.xxx
+ #allow.mount; # mount /etc/fstab.$name
#allow.set_hostname = 1; # Allow hostname to change
#allow.sysvipc = 1; # Allow SysV Interprocess Comm.
}
diff --git a/share/examples/jails/jng b/share/examples/jails/jng
--- a/share/examples/jails/jng
+++ b/share/examples/jails/jng
@@ -7,7 +7,7 @@
############################################################ IDENT(1)
#
# $Title: netgraph(4) management script for vnet jails $
-# $Version: 9.1 $
+# $Version: 9.2 $
#
############################################################ INFORMATION
#
@@ -22,15 +22,15 @@
#
# xxx {
# host.hostname = "xxx.yyy";
-# path = "/vm/xxx";
+# path = "/vm/$name";
#
# #
# # NB: Below 2-lines required
-# # NB: The number of ngN_xxx interfaces should match the number of
-# # arguments given to `jng bridge xxx' in exec.prestart value.
+# # NB: The number of ngN_$name interfaces should match the number of
+# # arguments given to `jng bridge $name' in exec.prestart value.
# #
# vnet;
-# vnet.interface = ng0_xxx, ng1_xxx, ...;
+# vnet.interface = ng0_$name, ng1_$name, ...;
#
# exec.clean;
# exec.system_user = "root";
@@ -38,20 +38,20 @@
#
# #
# # NB: Below lines required
-# # NB: The number of arguments after `jng bridge xxx' should match
-# # the number of ngN_xxx arguments in vnet.interface value.
-# # NB: Return each ngN_xxx to the host in prestop so the kernel does
+# # NB: The number of arguments after `jng bridge $name' should match
+# # the number of ngN_$name arguments in vnet.interface value.
+# # NB: Return each ngN_$name to the host in prestop so the kernel does
# # not move it during jail removal (BPF race). Destroy in poststop.
# #
-# exec.prestart += "jng bridge xxx em0 em1 ...";
-# exec.prestop += "ifconfig ng0_xxx -vnet xxx";
-# exec.prestop += "ifconfig ng1_xxx -vnet xxx";
-# exec.poststop += "jng shutdown xxx";
+# exec.prestart += "jng bridge $name em0 em1 ...";
+# exec.prestop += "ifconfig ng0_$name -vnet $name";
+# exec.prestop += "ifconfig ng1_$name -vnet $name";
+# exec.poststop += "jng shutdown $name";
#
# # Standard recipe
# exec.start += "/bin/sh /etc/rc";
# exec.stop = "/bin/sh /etc/rc.shutdown jail";
-# exec.consolelog = "/var/log/jail_xxx_console.log";
+# exec.consolelog = "/var/log/jail_${name}_console.log";
# mount.devfs;
#
# # Optional (default off)
@@ -138,7 +138,7 @@
############################################################ GLOBALS
-VERSION='$Version: 9.1 $'
+VERSION='$Version: 9.2 $'
pgm="${0##*/}" # Program basename

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 1, 1:00 AM (8 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37724796
Default Alt Text
D59032.id184443.diff (4 KB)

Event Timeline