Skip to content

ConfigDrive: use file absolute path instead of canonical path to create ISO #11623

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
borisstoyanov merged 4 commits into from
Jan 26, 2026
Merged

ConfigDrive: use file absolute path instead of canonical path to create ISO #11623

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa12b63
ConfigDrive: use file absolute path instead of canonical path to crea…
weizhouapache Sep 12, 2025
f6839d6
el8: add xorrisofs as option
weizhouapache Dec 3, 2025
b569b0a
Merge branch '4.20' into 4.20-fix-configdrive
weizhouapache Dec 3, 2025
5437feb
Merge branch '4.20' into 4.20-fix-configdrive
weizhouapache Dec 22, 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
4 changes: 2 additions & 2 deletions ...nfigdrive/src/main/java/org/apache/cloudstack/storage/configdrive/ConfigDriveBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,9 @@ static String getProgramToGenerateIso() throws IOException {
throw new CloudRuntimeException("Cannot create iso for config drive using any know tool. Known paths [/usr/bin/genisoimage, /usr/bin/mkisofs, /usr/local/bin/mkisofs]");
}
if (!isoCreator.canExecute()) {
throw new CloudRuntimeException("Cannot create iso for config drive using: " + isoCreator.getCanonicalPath());
throw new CloudRuntimeException("Cannot create iso for config drive using: " + isoCreator.getAbsolutePath());
}
return isoCreator.getCanonicalPath();
return isoCreator.getAbsolutePath();
}

/**
Expand Down
12 changes: 6 additions & 6 deletions ...drive/src/test/java/org/apache/cloudstack/storage/configdrive/ConfigDriveBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ public void getProgramToGenerateIsoTestGenIsoExistsAndIsExecutable() throws Exce

Mockito.verify(genIsoFileMock, Mockito.times(2)).exists();
Mockito.verify(genIsoFileMock).canExecute();
Mockito.verify(genIsoFileMock).getCanonicalPath();
Mockito.verify(genIsoFileMock).getAbsolutePath();
}
}

Expand Down Expand Up @@ -475,11 +475,11 @@ public void getProgramToGenerateIsoTestNotGenIsoMkIsoInLinux() throws Exception

Mockito.verify(genIsoFileMock, Mockito.times(1)).exists();
Mockito.verify(genIsoFileMock, Mockito.times(0)).canExecute();
Mockito.verify(genIsoFileMock, Mockito.times(0)).getCanonicalPath();
Mockito.verify(genIsoFileMock, Mockito.times(0)).getAbsolutePath();

Mockito.verify(mkIsoProgramInLinuxFileMock, Mockito.times(2)).exists();
Mockito.verify(mkIsoProgramInLinuxFileMock, Mockito.times(1)).canExecute();
Mockito.verify(mkIsoProgramInLinuxFileMock, Mockito.times(1)).getCanonicalPath();
Mockito.verify(mkIsoProgramInLinuxFileMock, Mockito.times(1)).getAbsolutePath();
}
}

Expand Down Expand Up @@ -509,15 +509,15 @@ public void getProgramToGenerateIsoTestMkIsoMac() throws Exception {

Mockito.verify(genIsoFileMock, Mockito.times(1)).exists();
Mockito.verify(genIsoFileMock, Mockito.times(0)).canExecute();
Mockito.verify(genIsoFileMock, Mockito.times(0)).getCanonicalPath();
Mockito.verify(genIsoFileMock, Mockito.times(0)).getAbsolutePath();

Mockito.verify(mkIsoProgramInLinuxFileMock, Mockito.times(1)).exists();
Mockito.verify(mkIsoProgramInLinuxFileMock, Mockito.times(0)).canExecute();
Mockito.verify(mkIsoProgramInLinuxFileMock, Mockito.times(0)).getCanonicalPath();
Mockito.verify(mkIsoProgramInLinuxFileMock, Mockito.times(0)).getAbsolutePath();

Mockito.verify(mkIsoProgramInMacOsFileMock, Mockito.times(1)).exists();
Mockito.verify(mkIsoProgramInMacOsFileMock, Mockito.times(1)).canExecute();
Mockito.verify(mkIsoProgramInMacOsFileMock, Mockito.times(1)).getCanonicalPath();
Mockito.verify(mkIsoProgramInMacOsFileMock, Mockito.times(1)).getAbsolutePath();
}
}

Expand Down
Loading