File tree Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -542,7 +542,10 @@ def create(self, release_name: str) -> None:
542
542
self .get_or_create_dataset ("root" )
543
543
self ._update_fstab ()
544
544
545
- backend = None
545
+ backend : typing .Optional [typing .Union [
546
+ iocage .lib .StandaloneJailStorage .StandaloneJailStorage ,
547
+ iocage .lib .NullFSBasejailStorage .NullFSBasejailStorage ,
548
+ iocage .lib .ZFSBasejailStorage .ZFSBasejailStorage ]] = None
546
549
547
550
is_basejail = self .config .get ("basejail" , False )
548
551
if not is_basejail :
@@ -1038,14 +1041,14 @@ def _teardown_mounts(self) -> None:
1038
1041
))
1039
1042
1040
1043
iocage .lib .helpers .umount (
1041
- mountpoints ,
1044
+ mountpoints = mountpoints ,
1042
1045
force = True ,
1043
1046
logger = self .logger ,
1044
1047
ignore_error = True
1045
1048
)
1046
1049
1047
1050
iocage .lib .helpers .umount (
1048
- ["-a" , "-F" , self .fstab .path ],
1051
+ options = ["-a" , "-F" , self .fstab .path ],
1049
1052
force = True ,
1050
1053
logger = self .logger ,
1051
1054
ignore_error = True
Original file line number Diff line number Diff line change @@ -414,8 +414,9 @@ def shell(
414
414
def umount (
415
415
mountpoint : typing .Optional [typing .Union [
416
416
iocage .lib .Types .AbsolutePath ,
417
- typing .List [iocage .lib .Types .AbsolutePath ]
417
+ typing .List [iocage .lib .Types .AbsolutePath ],
418
418
]]= None ,
419
+ options : typing .Optional [typing .List [str ]]= None ,
419
420
force : bool = False ,
420
421
ignore_error : bool = False ,
421
422
logger : typing .Optional [iocage .lib .Logger .Logger ]= None
@@ -426,6 +427,9 @@ def umount(
426
427
if force is True :
427
428
cmd .append ("-f" )
428
429
430
+ if options is not None and len (options ) != 0 :
431
+ cmd + options
432
+
429
433
if isinstance (mountpoint , list ):
430
434
cmd += mountpoint
431
435
elif isinstance (mountpoint , iocage .lib .Types .AbsolutePath ):
You can’t perform that action at this time.
0 commit comments