diff options
| author | Lars Wirzenius <liw@liw.fi> | 2023-07-13 10:53:37 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2023-07-13 10:53:37 +0300 |
| commit | 748382a0384508fe6cee084f71e25ad450623285 (patch) | |
| tree | 78cc88f891d6f89ffe536091a7c5a2d13a27d11e | |
| parent | 359a98beda8c105c2af831d665b0bf684604bad3 (diff) | |
| download | vmdb2-748382a0384508fe6cee084f71e25ad450623285.tar.gz | |
Revert "mount_plugin virtualfs_plugin: normalize mountpoint paths"
This breaks things, so reverting while we figure out a fix.
| -rw-r--r-- | vmdb/plugins/mount_plugin.py | 7 | ||||
| -rw-r--r-- | vmdb/plugins/virtualfs_plugin.py | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vmdb/plugins/mount_plugin.py b/vmdb/plugins/mount_plugin.py index b8ebcb1..699ffc5 100644 --- a/vmdb/plugins/mount_plugin.py +++ b/vmdb/plugins/mount_plugin.py @@ -15,6 +15,7 @@ # # =*= License: GPL-3+ =*= + import logging import os import tempfile @@ -60,10 +61,8 @@ class MountStepRunner(vmdb.StepRunnerInterface): if not state.tags.has_tag(mount_on): raise Exception("cannot find tag {}".format(mount_on)) - mount_point = os.path.normpath( - os.path.join( - state.tags.get_builder_mount_point(mount_on), "./" + dirname - ) + mount_point = os.path.join( + state.tags.get_builder_mount_point(mount_on), "./" + dirname ) if not os.path.exists(mount_point): diff --git a/vmdb/plugins/virtualfs_plugin.py b/vmdb/plugins/virtualfs_plugin.py index 6416a12..9f440f8 100644 --- a/vmdb/plugins/virtualfs_plugin.py +++ b/vmdb/plugins/virtualfs_plugin.py @@ -54,7 +54,8 @@ class VirtualFilesystemMountStepRunner(vmdb.StepRunnerInterface): if not hasattr(state, "virtuals"): state.virtuals = [] - path = os.path.normpath(os.path.join(rootfs, "./" + mount_point)) + for device, mount_point, fstype in self.virtuals: + path = os.path.join(rootfs, "./" + mount_point) if not os.path.exists(path): os.mkdir(path) vmdb.runcmd(["mount", "-t", fstype, device, path]) |