Skip to content

Include commit ID in boot menus Issue #2 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vamoosev wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −4
Open

Include commit ID in boot menus Issue #2 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM --platform=linux/amd64 ubuntu:jammy
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y install wget fdisk libarchive-tools xorriso cd-boot-images-amd64
RUN apt-get update && apt-get -y install wget fdisk libarchive-tools xorriso cd-boot-images-amd64 git
RUN mkdir /app && wget -O /app/ubuntu.iso https://releases.ubuntu.com/jammy/ubuntu-22.04.5-live-server-amd64.iso
COPY build-ytl-image /app/
COPY mangle-image /app/
COPY commit_hash /app/
COPY templates/ /app/templates/
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
INSTALL_IMAGE = "ytl-install-22.iso"
INSTALL_IMAGE = "app/ytl-install-22.iso"
VM_NAME = YTL Linux
VM_DISK_SIZE = 51200
VM_MEMORY_SIZE = 4096

docker:
mkdir -p bin
pwd
git rev-parse --short HEAD > commit_hash
-docker rm ytl-linux-builder
docker build -t ytl-linux-build-img:latest -f Dockerfile.build .
docker run -w /app --name ytl-linux-builder ytl-linux-build-img:latest ./build-ytl-image
Expand Down
7 changes: 6 additions & 1 deletion mangle-image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ set -e
# The main repository checkout is in the current working directory.

WORKDIR="$1"
if [ -f commit_hash ]; then
COMMIT_HASH=$(cat commit_hash)
else
COMMIT_HASH="$(git rev-parse --short HEAD)"
fi

#########################################
# Step 2: UEFI boot mode / GRUB
Expand All @@ -18,7 +23,7 @@ sed -i '/Install Ubuntu Server/iINCLUDE_YTL_MENU' "$WORKDIR"/boot/grub/grub.cfg
sed -i '/INCLUDE_YTL_MENU/r templates/ytl-grub.cfg' "$WORKDIR"/boot/grub/grub.cfg
sed -i '/INCLUDE_YTL_MENU/d' "$WORKDIR"/boot/grub/grub.cfg
sed -i "s|##AUTOINSTALL_URL##|$AUTOINSTALL_URL|" "$WORKDIR"/boot/grub/grub.cfg

sed -i "s/##COMMIT_HASH##/$COMMIT_HASH/" "$WORKDIR"/boot/grub/grub.cfg
# disable timeout to avoid installation loops and accidents
sed -i 's/timeout=[[:digit:]]\+/timeout=-1/' "$WORKDIR"/boot/grub/grub.cfg

Expand Down
2 changes: 1 addition & 1 deletion templates/ytl-grub.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
menuentry "Install YTL Ubuntu Server" {
menuentry "Install YTL Ubuntu Server | ##COMMIT_HASH##" {
set gfxpayload=keep
linux /casper/vmlinuz quiet nomodeset --- autoinstall ds=nocloud-net\;s=##AUTOINSTALL_URL##
initrd /casper/initrd
Expand Down