shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

F #5505: Add nouuid option for xfs volumes

Browse Source 
co-authored-by: Daniel Clavijo Coca <dclavijo@opennebula.io>
(cherry picked from commit 2dc310f179432539f653a2686d11e55df81eaf52)
This commit is contained in:
Ruben S. Montero 2021-09-10 19:32:20 +02:00
parent e1a9330d1c
commit 93a9fc2175
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/vmm_mad/remotes/lib/lxc/storage/storageutils.rb
View File

@ -55,17 +55,18 @@ module Storage
device_fs = device_fs(device)
end
# Resize device if extX like filesystem is used
if device_fs.match?(/^ext([2-4])$/)
# resize and mount operations according to the used filesystem
case device_fs
when /^ext([2-4])$/
resize_ext(device)
end
# Mount device in mapper folder <sys_ds>/<vm_id>/mapper/disk.id
return false unless mount(device, mountpoint)
return false unless mount(device, mountpoint)
when 'xfs'
return false unless mount(device, mountpoint, 'nouuid')
# Resize device if xfs like filesystem is used
if device_fs == 'xfs'
resize_xfs(mountpoint)
else
return false unless mount(device, mountpoint)
end
# Bind @mountpoint into to the public accesible folder (@bindpoint)
@ -137,9 +138,11 @@ module Storage
private
# Mount device in directory
def mount(device, directory, _options = {})
def mount(device, directory, options = '')
FileUtils.mkdir_p(directory)
cmd = "#{COMMANDS[:mount]} #{device} #{directory}"
cmd << " -o #{options}" unless options.empty?
Command.execute_rc_log(cmd)
end