systemvmtemplate: use latest LTS kernel from buster-ports (#5073)

* systemvmtemplate: use latest LTS kernel from buster-ports

Use the latest v5.10 Linux kernel (LTS) from buster-ports

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 2dd1650276e7fa31fc3b920b67be8396647c279d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

* Update configure_grub.sh

* changes

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

* fix failing build

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

* Update install_systemvm_packages.sh
This commit is contained in:
Rohit Yadav 2021-07-15 13:00:51 +05:30 committed by GitHub
parent 50a16979c5
commit cc27c70e5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 8 deletions

View File

@ -45,6 +45,10 @@ d-i apt-setup/services-select multiselect security, updates
d-i apt-setup/security_host string security.debian.org d-i apt-setup/security_host string security.debian.org
d-i apt-setup/local0/source boolean false d-i apt-setup/local0/source boolean false
d-i apt-setup/multiarch string i386 d-i apt-setup/multiarch string i386
d-i apt-setup/backports boolean true
d-i apt-setup/contrib boolean true
d-i apt-setup/multiverse boolean true
d-i apt-setup/universe boolean true
### Clock and time zone setup ### Clock and time zone setup
d-i clock-setup/utc boolean true d-i clock-setup/utc boolean true
@ -56,13 +60,13 @@ d-i partman-auto/disk string /dev/vda
d-i partman-auto/method string regular d-i partman-auto/method string regular
d-i partman-auto/expert_recipe string \ d-i partman-auto/expert_recipe string \
boot-root :: \ boot-root :: \
100 60 100 ext2 \ 400 60 400 ext2 \
$primary{ } $bootable{ } \ $primary{ } $bootable{ } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext2 } \ use_filesystem{ } filesystem{ ext2 } \
mountpoint{ /boot } \ mountpoint{ /boot } \
. \ . \
2240 40 2500 ext4 \ 2240 40 4000 ext4 \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \ mountpoint{ / } \

View File

@ -53,11 +53,16 @@ function apt_upgrade() {
rm -fv /root/*.iso rm -fv /root/*.iso
apt-get -q -y update apt-get -q -y update
apt-get -q -y upgrade apt-get -q -y upgrade
apt-get -q -y dist-upgrade apt-get -q -y dist-upgrade
apt-get -q -y upgrade -t buster-backports
apt-get -q -y dist-upgrade -t buster-backports
apt-get -y autoremove --purge apt-get -y autoremove --purge
apt-get autoclean apt-get autoclean
apt-get clean apt-get clean
reboot
} }
return 2>/dev/null || apt_upgrade return 2>/dev/null || apt_upgrade

View File

@ -20,6 +20,9 @@ set -e
set -x set -x
function configure_grub() { function configure_grub() {
# Remove the old/unused kernel
dpkg --list | grep linux-image | awk '{ print $2 }' | sort -V | sed -n '/'`uname -r`'/q;p' | xargs sudo apt-get remove -y --purge || true
apt-get -y autoremove --purge
echo "blacklist floppy" > /etc/modprobe.d/blacklist-floppy.conf echo "blacklist floppy" > /etc/modprobe.d/blacklist-floppy.conf
rmmod floppy || true rmmod floppy || true
update-initramfs -u update-initramfs -u

View File

@ -22,7 +22,7 @@ set -x
function install_vhd_util() { function install_vhd_util() {
[[ -f /bin/vhd-util ]] && return [[ -f /bin/vhd-util ]] && return
wget --no-check-certificate https://github.com/shapeblue/cloudstack-nonoss/raw/master/vhd-util -O /bin/vhd-util wget --no-check-certificate https://github.com/shapeblue/cloudstack-nonoss/raw/main/vhd-util -O /bin/vhd-util
chmod a+x /bin/vhd-util chmod a+x /bin/vhd-util
} }
@ -42,7 +42,7 @@ function install_packages() {
debconf_packages debconf_packages
local apt_get="apt-get --no-install-recommends -q -y" local apt_get="apt-get --no-install-recommends -q -y -t buster-backports"
${apt_get} install grub-legacy \ ${apt_get} install grub-legacy \
rsyslog logrotate cron net-tools ifupdown tmux vim-tiny htop netbase iptables nftables \ rsyslog logrotate cron net-tools ifupdown tmux vim-tiny htop netbase iptables nftables \
@ -76,8 +76,6 @@ function install_packages() {
apt-get clean apt-get clean
apt-get autoclean apt-get autoclean
${apt_get} install links
#32 bit architecture support for vhd-util: not required for 32 bit template #32 bit architecture support for vhd-util: not required for 32 bit template
if [ "${arch}" != "i386" ]; then if [ "${arch}" != "i386" ]; then
dpkg --add-architecture i386 dpkg --add-architecture i386

View File

@ -6,7 +6,14 @@
"type": "shell", "type": "shell",
"execute_command": "echo 'cloud' | sudo -u root -S bash {{.Path}}", "execute_command": "echo 'cloud' | sudo -u root -S bash {{.Path}}",
"scripts": [ "scripts": [
"scripts/apt_upgrade.sh", "scripts/apt_upgrade.sh"
],
"expect_disconnect": true
},
{
"type": "shell",
"execute_command": "echo 'cloud' | sudo -u root -S bash {{.Path}}",
"scripts": [
"scripts/configure_grub.sh", "scripts/configure_grub.sh",
"scripts/configure_locale.sh", "scripts/configure_locale.sh",
"scripts/configure_networking.sh", "scripts/configure_networking.sh",
@ -33,7 +40,7 @@
[ "-smp", "1" ] [ "-smp", "1" ]
], ],
"format": "qcow2", "format": "qcow2",
"disk_size": 2500, "disk_size": 3000,
"disk_interface": "virtio", "disk_interface": "virtio",
"net_device": "virtio-net", "net_device": "virtio-net",
"iso_url": "https://cdimage.debian.org/debian-cd/10.9.0/amd64/iso-cd/debian-10.9.0-amd64-netinst.iso", "iso_url": "https://cdimage.debian.org/debian-cd/10.9.0/amd64/iso-cd/debian-10.9.0-amd64-netinst.iso",