Skip to content

Commit

Permalink
Merge pull request #72 from ElstonLewis/Ubuntu_2404
Browse files Browse the repository at this point in the history
Added Ubuntu 22.04 boot partition to mount script
ElstonLewis authored May 2, 2024
2 parents 0bc612f + 3e5be72 commit f5d0b50
Showing 4 changed files with 7 additions and 17 deletions.
9 changes: 0 additions & 9 deletions files/cloudinit-specific/07_network.cfg

This file was deleted.

3 changes: 0 additions & 3 deletions scripts/linux/boot.sh
Original file line number Diff line number Diff line change
@@ -4,8 +4,5 @@ set -e
if [[ "$1" == "ubuntu20"* ]] || [[ "$1" == "ubuntu22"* ]] || [[ "$1" == "ubuntu24"* ]]; then
# Fix for network interfaces not picked up
sed -i 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="acpi_irq_isa=10 net.ifnames=0"/g' /mnt/etc/default/grub
if [[ "$1" == "ubuntu24"* ]]; then
chroot /mnt/ mkdir -p /boot/grub
fi
chroot /mnt/ update-grub
fi
5 changes: 0 additions & 5 deletions scripts/linux/cloud-init.sh
Original file line number Diff line number Diff line change
@@ -7,8 +7,3 @@ if [[ "$1" == "ubuntu2204" ]] || [[ "$1" == "ubuntu2404" ]] || [[ "$1" == "rocky
#Add FNI Hotplug support
cp /tmp/cloudinit-specific/06_hotplug.cfg /mnt/etc/cloud/cloud.cfg.d/
fi

if [[ "$1" == "ubuntu2404" ]]; then
#Add cloud-init 24.1.3 network support
cp /tmp/cloudinit-specific/07_network.cfg /mnt/etc/cloud/cloud.cfg.d/
fi
7 changes: 7 additions & 0 deletions scripts/linux/mount.sh
Original file line number Diff line number Diff line change
@@ -24,4 +24,11 @@ if [[ "$1" == "debian"* ]]; then
efi_partition=$(fdisk -lo device,type /dev/sda | grep -E '^\/dev\/' | tr -s ' ' | grep -E 'EFI' | head -n1 | cut -d ' ' -f1)
mkdir -p /mnt/boot/efi
mount $efi_partition /mnt/boot/efi
fi

if [[ "$1" == "ubuntu24"* ]]; then
# Get Extended Linux partition for boot/grub
ext_partition=$(fdisk -lo device,type /dev/sda | grep -E '^\/dev\/' | tr -s ' ' | grep -E 'extended' | head -n1 | cut -d ' ' -f1)
mkdir -p /mnt/boot
mount $ext_partition /mnt/boot
fi

0 comments on commit f5d0b50

Please sign in to comment.