Skip to content

Commit

Permalink
grub fixes, enable serial over lan, check improvements, dns / resolve…
Browse files Browse the repository at this point in the history
…r fixes, cloud-init mods
  • Loading branch information
ajanis committed Sep 6, 2024
1 parent bc756ee commit cc4174c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 62 deletions.
13 changes: 7 additions & 6 deletions harmonic/scripts/iso-builders/apollo-customize-and-rebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,12 @@ function extractRootfs() {
return
}
function extractIso() {
runPrint "Extract ${isoMount} to ${isoTemp}"
if [[ -d "${isoTemp}" ]]; then
runPrint "Removing old files from ${isoTemp}"
rm -rf "${isoTemp:?}/*"
fi

runPrint "Extract ${isoMount} to ${isoTemp}"
rsync -avp "${isoMount}/" "${isoTemp}/"
return
}
Expand Down Expand Up @@ -176,7 +177,7 @@ set timeout=15
set default=0
menuentry "Harmonic Installer Live ISO (Ubuntu 20.04)" {
rmmod tpm
linux /casper/vmlinuz boot=casper noprompt noeject nopersistent nomodeset quiet splash fsck.mode=skip --
linux /casper/vmlinuz boot=casper noeject fsck.mode=skip nomodeset nopersistent --- console=tty0 console=ttyS0,115200n8
initrd /casper/initrd
}
EOG
Expand All @@ -188,7 +189,7 @@ default ubuntu2004live
label ubuntu2004live
menu label ^Ubuntu 20.04 Live-Only
kernel /casper/vmlinuz
append initrd=/casper/initrd boot=casper noprompt noeject nopersistent nomodeset quiet splash fsck.mode=skip
append initrd=/casper/initrd boot=casper noeject nomodeset fsck.mode=skip nopersistent console=tty0 console=ttyS0,115200n8
EOI

runPrint "Updating ${isoTemp}/${squashfsIsoPath}"
Expand All @@ -211,7 +212,7 @@ function buildIso() {
runPrint "Removing existing file ${newIso}"
rm -f "${newIso}"
fi

cat <<EOG
=====================================================================================
Expand All @@ -231,7 +232,7 @@ EOG
updateIsoFiles

xorriso -as mkisofs \
-r -V "ubuntu" \
-r -V "UBUNTU" -J \
-l -cache-inodes \
-b isolinux/isolinux.bin \
-c isolinux/boot.cat \
Expand All @@ -247,7 +248,7 @@ EOG
return
}

function deployIso() {
function deployIso() {

if [[ ! -f ${newIso} ]]; then
runPrint "No ISO found at ${newIso} to deploy !!"
Expand Down
56 changes: 0 additions & 56 deletions harmonic/scripts/iso-builders/ubuntu-create-liveiso.sh

This file was deleted.

0 comments on commit cc4174c

Please sign in to comment.