diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-14 22:28:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-14 22:28:01 +0000 |
| commit | d0cfec26f48285d812ac328de68c386f061a6cac (patch) | |
| tree | 01a4f48c82fa9d688b76e9013483116344384bd6 | |
| parent | c6fcfa509ee4df41ab30f8cdc1daa88f39b33c86 (diff) | |
| parent | 60b38f1c8279db935a45c873fb1a072209f12061 (diff) | |
| download | nova-d0cfec26f48285d812ac328de68c386f061a6cac.tar.gz nova-d0cfec26f48285d812ac328de68c386f061a6cac.tar.xz nova-d0cfec26f48285d812ac328de68c386f061a6cac.zip | |
Merge "Chown doesn't work on mounted vfat."
| -rw-r--r-- | nova/tests/test_configdrive2.py | 4 | ||||
| -rw-r--r-- | nova/virt/configdrive.py | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/nova/tests/test_configdrive2.py b/nova/tests/test_configdrive2.py index 260ab28c7..28fa423e0 100644 --- a/nova/tests/test_configdrive2.py +++ b/nova/tests/test_configdrive2.py @@ -67,11 +67,9 @@ class ConfigDriveTestCase(test.TestCase): utils.mkfs('vfat', mox.IgnoreArg(), label='config-2').AndReturn(None) - utils.trycmd('mount', '-o', 'loop', mox.IgnoreArg(), + utils.trycmd('mount', '-o', mox.IgnoreArg(), mox.IgnoreArg(), mox.IgnoreArg(), run_as_root=True).AndReturn((None, None)) - utils.trycmd('chown', mox.IgnoreArg(), mox.IgnoreArg(), - run_as_root=True).AndReturn((None, None)) utils.execute('umount', mox.IgnoreArg(), run_as_root=True).AndReturn(None) diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py index d4352c5e6..886136460 100644 --- a/nova/virt/configdrive.py +++ b/nova/virt/configdrive.py @@ -130,20 +130,16 @@ class ConfigDriveBuilder(object): try: mountdir = tempfile.mkdtemp(dir=CONF.config_drive_tempdir, prefix='cd_mnt_') - _out, err = utils.trycmd('mount', '-o', 'loop', path, mountdir, + _out, err = utils.trycmd('mount', '-o', + 'loop,uid=%d,gid=%d' % (os.getuid(), + os.getgid()), + path, mountdir, run_as_root=True) if err: raise exception.ConfigDriveMountFailed(operation='mount', error=err) mounted = True - _out, err = utils.trycmd('chown', - '%s.%s' % (os.getuid(), os.getgid()), - mountdir, run_as_root=True) - if err: - raise exception.ConfigDriveMountFailed(operation='chown', - error=err) - # NOTE(mikal): I can't just use shutils.copytree here, because the # destination directory already exists. This is annoying. for ent in os.listdir(self.tempdir): |