Skip to content

Switch from genisoimage to xorriso #182

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.

Sign up for GitHub

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

Merged
ekohl merged 3 commits into from
Mar 17, 2026
Merged

Switch from genisoimage to xorriso #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b340fc8
Introduce variables for ISO file paths
ekohl Dec 24, 2025
3e88185
Switch from genisoimage to xorriso
ekohl Dec 24, 2025
f6e01e5
Call system() with an array of arguments
ekohl Dec 24, 2025
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
10 changes: 6 additions & 4 deletions lib/fog/libvirt/models/compute/server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,14 @@ def generate_config_iso(user_data, &blk)
end

def generate_config_iso_in_dir(dir_path, user_data, &blk)
FileUtils.touch(File.join(dir_path, "meta-data"))
File.open(File.join(dir_path, 'user-data'), 'w') { |f| f.write user_data }
meta_data_path = File.join(dir_path, 'meta-data')
FileUtils.touch(meta_data_path)
user_data_path = File.join(dir_path, 'user-data')
File.write(user_data_path, user_data)

isofile = Tempfile.new(['init', '.iso']).path
unless system("genisoimage -output #{isofile} -volid cidata -joliet -rock #{File.join(dir_path, 'user-data')} #{File.join(dir_path, 'meta-data')}")
raise Fog::Errors::Error.new("Couldn't generate cloud-init iso disk with genisoimage.")
unless system('xorrisofs', '-output', isofile, '-volid', 'cidata', '-joliet', '-rock', user_data_path, meta_data_path)
raise Fog::Errors::Error.new("Couldn't generate cloud-init iso disk with xorrisofs.")
end
blk.call(isofile)
end
Expand Down
2 changes: 1 addition & 1 deletion minitests/server/user_data_iso_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def test_contains_user_data_file

def test_iso_is_generated
in_a_temp_dir do |d|
@server.expects(:system).with(regexp_matches(/^genisoimage/)).returns(true)
@server.expects(:system).with { |command, *_args| command == 'xorrisofs' }.returns(true)
@server.generate_config_iso_in_dir(d, @test_data) {|iso| }
end
end
Expand Down