File tree 2 files changed +5
-1
lines changed
2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -73,6 +73,7 @@ def ensure_firewall_enabled(self) -> None:
73
73
)
74
74
return
75
75
except Exception :
76
+ # an IocageException is raised in the next step at the right level
76
77
pass
77
78
78
79
hint = f"sysctl { key } is expected to be { expected } , but was { current } "
Original file line number Diff line number Diff line change @@ -1661,6 +1661,7 @@ def __get_launch_command(jail_args: typing.List[str]) -> typing.List[str]:
1661
1661
@property
1662
1662
def _launch_args (self ) -> typing .List [str ]:
1663
1663
config = self .config
1664
+ vnet = (config ["vnet" ] is True )
1664
1665
value : str
1665
1666
jail_param_args : typing .List [str ] = []
1666
1667
for sysctl_name , sysctl in libioc .JailParams .JailParams ().items ():
@@ -1677,11 +1678,13 @@ def _launch_args(self) -> typing.List[str]:
1677
1678
elif sysctl_name == "security.jail.param.allow.mount.zfs" :
1678
1679
value = str (self ._allow_mount_zfs )
1679
1680
elif sysctl_name == "security.jail.param.vnet" :
1680
- if config [ " vnet" ] is False :
1681
+ if vnet is False :
1681
1682
# vnet is only used when explicitly enabled
1682
1683
# (friendly to Kernels without VIMAGE support)
1683
1684
continue
1684
1685
value = "vnet"
1686
+ elif vnet and sysctl_name .startswith ("security.jail.param.ip" ):
1687
+ continue
1685
1688
else :
1686
1689
config_property_name = sysctl .iocage_name
1687
1690
if self .config ._is_known_property (config_property_name ):
You can’t perform that action at this time.
0 commit comments