Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

B #26: fix virt tools path #27

Merged
merged 1 commit into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions oneswap
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ CommandParser::CmdParser.new(ARGV) do
RHSRVANY = {
:name => 'virt_tools',
:large => '--virt-tools /path/to/virt-tools',
:description => 'Path to the directory containing rhsrvany.exe, defaults to /usr/share/virt-tools. See https://github.com/rwmjones/rhsrvany.',
:description => 'Path to the directory containing rhsrvany.exe, defaults to /usr/local/share/virt-tools. See https://github.com/rwmjones/rhsrvany.',
:format => String
}

Expand Down Expand Up @@ -554,7 +554,7 @@ CommandParser::CmdParser.new(ARGV) do
options[:context] ||= '/var/lib/one/context/'
options[:esxi_user] ||= 'root'
options[:datastore] ||= 1
options[:virt_tools] ||= '/usr/share/virt-tools'
options[:virt_tools] ||= '/usr/local/share/virt-tools'
options[:v2v_path] ||= 'virt-v2v'
options[:config_file] ||= '/var/lib/one/oneswap.yaml'

Expand Down
16 changes: 8 additions & 8 deletions oneswap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
#:datastore: 1 # ID of the OpenNebula Image datastore

# virt-v2v Options
#:work_dir: '/tmp' # Directory where disk conversion takes place, will make subdir for each VM
#:format: 'qcow2' # Disk format [ qcow2 | raw ]
#:vddk_path: # Path to VDDK library
#:qemu_ga_win: # Path to QEMU Guest Agent ISO for Windows
#:qemu_ga_linux: # Install QEMU Guest Agent for Linux
#:virtio_path: # Path to VirtIO drivers for Windows
#:virt_tools: /usr/share/virt-tools # Path to the directory containing rhsrvany.exe
#:v2v_path: 'virt-v2v' # Path to virt-v2v
#:work_dir: '/tmp' # Directory where disk conversion takes place, will make subdir for each VM
#:format: 'qcow2' # Disk format [ qcow2 | raw ]
#:vddk_path: # Path to VDDK library
#:qemu_ga_win: # Path to QEMU Guest Agent ISO for Windows
#:qemu_ga_linux: # Install QEMU Guest Agent for Linux
#:virtio_path: # Path to VirtIO drivers for Windows
#:virt_tools: /usr/local/share/virt-tools # Path to the directory containing rhsrvany.exe
#:v2v_path: 'virt-v2v' # Path to virt-v2v

# Extra Options
#:delete: false # Delete the VM Disks after transfer
Expand Down