kiss-vm: add ubuntu in distro-db

Signed-off-by: Jianhong Yin <[email protected]>
tcler · May 27, 2024 · 6cf4738 · 6cf4738
1 parent c8a5c5e
commit 6cf4738
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/distro-db.bash b/distro-db.bash
@@ -23,7 +23,7 @@ lstv=39
 for fv in rawhide $((lstv+1)); do distroInfo[f$fv]=$fbaseurl/development/$fv/Cloud/$GuestARCH/images/; done
 eval "for fv in {$((lstv-4))..$lstv}"'; do distroInfo[f$fv]=$fbaseurl/releases/$fv/Cloud/$GuestARCH/images/; done'
 
-#### Debian
+#### Debian/Ubuntu
 # https://cloud.debian.org/images/openstack/testing/
 # https://cloud.debian.org/images/openstack/$latestVersion/
 # https://cloud.debian.org/images/openstack/archive/$olderVersion/
@@ -32,6 +32,8 @@ distroInfo[debian-12]="http://cloud.debian.org/images/cloud/bookworm/latest/"
 distroInfo[debian-11]="http://cloud.debian.org/images/cloud/bullseye/latest/"
 distroInfo[debian-10]="https://cloud.debian.org/images/openstack/current-10/debian-10-openstack-${GuestARCH/x86_64/amd64}.qcow2"
 distroInfo[debian-9]="https://cloud.debian.org/images/openstack/current-9/debian-9-openstack-${GuestARCH/x86_64/amd64}.qcow2"
+distroInfo[ubuntu-24.04]="https://cloud-images.ubuntu.com/releases/24.04/release/ubuntu-24.04-server-cloudimg-${GuestARCH/x86_64/amd64}.img"
+distroInfo[ubuntu-23.10]="https://cloud-images.ubuntu.com/releases/23.10/release/ubuntu-23.10-server-cloudimg-${GuestARCH/x86_64/amd64}.img"
 
 #### OpenSUSE
 distroInfo[openSUSE-leap-15.5]="https://download.opensuse.org/repositories/Cloud:/Images:/Leap_15.5/images/openSUSE-Leap-15.5.$GuestARCH-NoCloud.qcow2"

diff --git a/kiss-vm b/kiss-vm
@@ -3195,7 +3195,7 @@ distroSelectNull() { tput cup $(tput lines) 0; echo -e "\n{VM:WARN} ^^^ you didn
 		dialogres=$RuntimeTmp/dialogRes
 		touch $distropatternInter $distropatternIntra
 
-		echo -e "Alma\nRocky\nCentOS\nfedora\ndebian\nopenSUSE\narchlinux\nFreeBSD\nWindows" >>$distropatternInter
+		echo -e "Alma\nRocky\nCentOS\nfedora\ndebian\nubuntu\nopenSUSE\narchlinux\nFreeBSD\nWindows" >>$distropatternInter
 		for dname in "${!distroInfo[@]}"; do echo "$dname"; done | sort -rV >>$distrolist
 
 		dialogTitle="vm-create"

diff --git a/utils/cloud-init-iso-gen.sh b/utils/cloud-init-iso-gen.sh
@@ -146,7 +146,7 @@ runcmd:
   - grep -q '^StrictHostKeyChecking no' /etc/ssh/ssh_config || echo "StrictHostKeyChecking no" >>/etc/ssh/ssh_config
   - echo net.ipv4.conf.all.rp_filter=2 >>/etc/sysctl.conf && sysctl -p
   - command -v yum && yum --setopt=strict=0 install -y bash-completion curl wget vim ipcalc expect $PKGS
-  -   command -v apt && { apt update -y; apt install -o APT::Install-Suggests=0 -o APT::Install-Recommends=0 -y bash-completion curl wget vim ipcalc expect network-manager $PKGS; }
+  -   command -v apt && { apt update -y; apt install -o APT::Install-Suggests=0 -o APT::Install-Recommends=0 -y bash-completion curl wget vim ipcalc expect network-manager $PKGS; systemctl restart NetworkManager; }
   -   command -v zypper && { zypper in --no-recommends -y bash-completion curl wget vim ipcalc expect NetworkManager $PKGS; systemctl restart NetworkManager; }
   -   command -v pacman && { pacman -Sy --noconfirm archlinux-keyring && pacman -Su --noconfirm; pacman-key --init; pacman-key --populate; }
   -   command -v pacman && { pacman -S --needed --noconfirm bash-completion curl wget vim ipcalc expect networkmanager $PKGS; systemctl restart NetworkManager; }