From 93a9fc21753bcac8c44b45313d6d781f3732e8eb Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 10 Sep 2021 19:32:20 +0200 Subject: [PATCH] F #5505: Add nouuid option for xfs volumes co-authored-by: Daniel Clavijo Coca (cherry picked from commit 2dc310f179432539f653a2686d11e55df81eaf52) --- .../remotes/lib/lxc/storage/storageutils.rb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/vmm_mad/remotes/lib/lxc/storage/storageutils.rb b/src/vmm_mad/remotes/lib/lxc/storage/storageutils.rb index 523d2e0cea..edd8e14dc9 100644 --- a/src/vmm_mad/remotes/lib/lxc/storage/storageutils.rb +++ b/src/vmm_mad/remotes/lib/lxc/storage/storageutils.rb @@ -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 //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