Skip to content

Ubuntu 26.04: remove requiretty from /etc/sudoers.d/cloudstack and fix setup-sysvm-tmplt #13476

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

Open
weizhouapache wants to merge 5 commits into
base: 4.22
Choose a base branch
from
+8 −5
Open

Ubuntu 26.04: remove requiretty from /etc/sudoers.d/cloudstack and fix setup-sysvm-tmplt #13476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02e89c0
debian/rules: remove requiretty from /etc/sudoers.d/cloudstack
weizhouapache Jun 23, 2026
7b2b391
fix scripts/storage/secondary/setup-sysvm-tmplt
weizhouapache Jun 25, 2026
695127a
marvin: revert mysql-connector-python to 8.0.30
weizhouapache Jun 24, 2026
7e15f1d
Apply "mysql-connector-python >= 8.4.0",
weizhouapache Jun 25, 2026
c0147c5
register systemvm template via /var/tmp in java too
weizhouapache Jul 1, 2026
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
1 change: 1 addition & 0 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ override_dh_auto_install:
# nast hack for a couple of configuration files
mv $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/cloudstack-limits.conf $(DESTDIR)/$(SYSCONFDIR)/security/limits.d/
mv $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/cloudstack-sudoers $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/$(PACKAGE)
sed -i '/requiretty/d' $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/$(PACKAGE)
chmod 0440 $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/$(PACKAGE)

install -D client/target/utilities/bin/cloud-update-xenserver-licenses $(DESTDIR)/usr/bin/cloudstack-update-xenserver-licenses
Expand Down
5 changes: 3 additions & 2 deletions engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public class SystemVmTemplateRegistration {
private static final String TEMPLATES_PATH = fetchTemplatesPath();
private static final String METADATA_FILE_NAME = "metadata.ini";
private static final String METADATA_FILE = TEMPLATES_PATH + METADATA_FILE_NAME;
public static final String TEMP_DIRECTORY = "/var/tmp";
public static final String TEMPORARY_SECONDARY_STORE = "tmp";
private static final String PARTIAL_TEMPLATE_FOLDER = String.format("/template/tmpl/%d/", Account.ACCOUNT_ID_SYSTEM);
private static final String storageScriptsDir = "scripts/storage/secondary";
Expand Down Expand Up @@ -360,7 +361,7 @@ public void setUpdated(Date updated) {
public boolean validateIfSeeded(TemplateDataStoreVO templDataStoreVO, String url, String path, String nfsVersion) {
String filePath = null;
try {
filePath = Files.createTempDirectory(TEMPORARY_SECONDARY_STORE).toString();
filePath = Files.createTempDirectory(Paths.get(TEMP_DIRECTORY), TEMPORARY_SECONDARY_STORE).toString();
if (filePath == null) {
throw new CloudRuntimeException("Failed to create temporary directory to mount secondary store");
}
Expand Down Expand Up @@ -962,7 +963,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
for (Long zoneId : zoneIds) {
String filePath = null;
try {
filePath = Files.createTempDirectory(TEMPORARY_SECONDARY_STORE).toString();
filePath = Files.createTempDirectory(Paths.get(TEMP_DIRECTORY), TEMPORARY_SECONDARY_STORE).toString();
if (filePath == null) {
throw new CloudRuntimeException("Failed to create temporary file path to mount the store");
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/storage/secondary/setup-sysvm-tmplt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ if [[ "$destfiles" != "" ]]; then
failed 2 "Data already exists at destination $destdir"
fi

tmpfolder=/tmp/cloud/templates/
tmpfolder=/var/tmp/cloud/templates/
Comment thread
DaanHoogland marked this conversation as resolved.
mkdir -p $tmpfolder
tmplfile=$tmpfolder/$localfile

Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/com/cloud/storage/StorageManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.net.URLDecoder;
import java.net.UnknownHostException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
Expand Down Expand Up @@ -4062,7 +4063,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
SystemVmTemplateRegistration systemVmTemplateRegistration = new SystemVmTemplateRegistration();
String filePath = null;
try {
filePath = Files.createTempDirectory(SystemVmTemplateRegistration.TEMPORARY_SECONDARY_STORE).toString();
filePath = Files.createTempDirectory(Paths.get(SystemVmTemplateRegistration.TEMP_DIRECTORY), SystemVmTemplateRegistration.TEMPORARY_SECONDARY_STORE).toString();
if (filePath == null) {
throw new CloudRuntimeException("Failed to create temporary file path to mount the store");
}
Expand Down
2 changes: 1 addition & 1 deletion tools/marvin/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"marvin.sandbox.basic"],
license="LICENSE.txt",
install_requires=[
"mysql-connector-python <= 8.4.0",
"mysql-connector-python >= 8.4.0",
"requests >= 2.2.1",
"paramiko >= 1.13.0",
"nose >= 1.3.3",
Expand Down
Loading