Page MenuHomeSoftware Heritage
Files F7343012

D4422.id.diff
No OneTemporary
Actions

D4422.id.diff
View Options

diff --git a/proxmox/templates/config/buster-preseed.cfg b/proxmox/templates/config/buster-preseed.cfg
--- a/proxmox/templates/config/buster-preseed.cfg
+++ b/proxmox/templates/config/buster-preseed.cfg
@@ -293,7 +293,7 @@
apparmor apparmor/homedirs string
# GRUB install devices:
# Choices: /dev/sda (21474 MB; VBOX_HARDDISK), - /dev/sda1 (254 MB; /boot), /dev/mapper/vagrant--template--vg-root (3976 MB; vagrant--template--vg-root)
-grub-pc grub-pc/install_devices multiselect /dev/sda
+grub-pc grub-pc/install_devices multiselect /dev/vda
# for internal use
d-i keyboard-configuration/optionscode string
keyboard-configuration keyboard-configuration/optionscode string
diff --git a/proxmox/templates/debian_buster.json b/proxmox/templates/debian_buster.json
--- a/proxmox/templates/debian_buster.json
+++ b/proxmox/templates/debian_buster.json
@@ -22,8 +22,9 @@
"username": "{{ user `username` }}",
"password": "{{ user `password` }}",
"node": "{{ user `proxmox_node` }}",
- "vm_id": 10001,
+ "vm_id": 10003,
"memory": 1024,
+ "sockets": "1",
"cores": 2,
"network_adapters": [
{
@@ -31,9 +32,10 @@
"model": "virtio"
}
],
+ "scsi_controller": "virtio-scsi-pci",
"disks": [
{
- "type": "scsi",
+ "type": "virtio",
"disk_size": "20G",
"storage_pool": "proxmox",
"storage_pool_type": "cephfs"
@@ -41,6 +43,7 @@
],
"qemu_agent": "true",
"cloud_init": "true",
+ "cloud_init_storage_pool": "proxmox",
"iso_url": "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.6.0-amd64-netinst.iso",
"iso_checksum": "2af8f43d4a7ab852151a7f630ba596572213e17d3579400b5648eba4cc974ed0",
@@ -73,7 +76,7 @@
"DEBCONF_DEBUG=5 <wait>",
"console-setup/ask_detect=false <wait>",
"console-keymaps-at/keymap=us <wait>",
- "grub-installer/bootdev=/dev/sda <wait>",
+ "grub-installer/bootdev=/dev/vda <wait>",
"<enter><wait>"
],
@@ -106,7 +109,7 @@
},
{
"type": "shell",
- "expect_disconnect": "true",
+ "expect_disconnect": "false",
"execute_command": "echo 'installer'|{{.Vars}} sudo -S -E bash '{{.Path}}'",
"scripts": [
"scripts/cleanup.sh"
diff --git a/proxmox/templates/scripts/proxmox.sh b/proxmox/templates/scripts/proxmox.sh
--- a/proxmox/templates/scripts/proxmox.sh
+++ b/proxmox/templates/scripts/proxmox.sh
@@ -1,7 +1,6 @@
#!/bin/bash -eu
-
-apt-get install -y cloud-init qemu qemu-guest-agent
+DEBIAN_FRONTEND=noninteractive apt-get install -y cloud-init qemu qemu-guest-agent
# Update grub for a faster boot
sed -i s'/GRUB_TIMEOUT = 5/GRUB_TIMEOUT = 0/' /etc/default/grub

File Metadata

Mime Type
text/plain
Expires
Mar 17 2025, 6:43 PM (7 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3226962

Event Timeline

About · Developer information · Legal