From 53cb7772daa6913eb01046b0c814dcf38674aa3e Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 15 Aug 2025 22:38:18 +0200 Subject: [PATCH] MT#60283 Update grml-live to version 0.54.1 Lots of changes took place in between v0.53.2 and v0.54.1. To ensure to follow upstream changes, let's make sure our configuration avoids relying on features that are going to be dropped in upcoming versions. Relevant changes: * FAI_DEBOOTSTRAP=... became BOOTSTRAP_MIRROR=... (without the Debian release name, but just requiring the mirror URL) * the templates command line option `-t ...` is considered deprecated, now that boot templates are also class-based configuration files (via ${GRML_FAI_CONFIG}/config/media-files/$CLASS) Let's keep our templates as-is, but provide grml_build/config/media-files/SIPWISE as symlink to our templates directory * GRMLBASE and architecture-specific classes are now enabled by default and no longer should be included in the grml-live invocation, so drop GRMLBASE + AMD64 class names in wrapper.sh * The RELEASE class (which cleans up /root and /home/grml) is also automatically enabled, but since we e.g. ship files like /root/puppet.gpg we need to disable this new behavior by enabling the new "-R" option Change-Id: I66dc8c685decac25370234844e33d4be60dea08a --- grml_build/Dockerfile | 4 ++-- grml_build/config/media-files/SIPWISE | 1 + wrapper.sh | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 120000 grml_build/config/media-files/SIPWISE diff --git a/grml_build/Dockerfile b/grml_build/Dockerfile index 78a7208..b070cdf 100755 --- a/grml_build/Dockerfile +++ b/grml_build/Dockerfile @@ -6,7 +6,7 @@ FROM docker.mgm.sipwise.com/sipwise-trixie:latest # is updated with the current date. It will force refresh of all # of the base images and things like `apt-get update` won't be using # old cached versions when the Dockerfile is built. -ENV REFRESHED_AT=2025-06-13 +ENV REFRESHED_AT=2025-08-15 # tools for building and testing RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ @@ -36,7 +36,7 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ # base build tools WORKDIR /code/ -RUN git clone -b 'v0.53.2' --single-branch --depth 1 https://github.com/grml/grml-live +RUN git clone -b 'v0.54.1' --single-branch --depth 1 https://github.com/grml/grml-live WORKDIR /code/grml-live diff --git a/grml_build/config/media-files/SIPWISE b/grml_build/config/media-files/SIPWISE new file mode 120000 index 0000000..0e4c94f --- /dev/null +++ b/grml_build/config/media-files/SIPWISE @@ -0,0 +1 @@ +../../../templates \ No newline at end of file diff --git a/wrapper.sh b/wrapper.sh index dc70441..f5e77ce 100755 --- a/wrapper.sh +++ b/wrapper.sh @@ -76,18 +76,18 @@ build_command+=" cp -rv /grml/config/ /code/grml-live/" build_command+=" && ulimit -n 1048576" # workaround to fix apt/apt-mark performance issue build_command+=" && GRML_NAME=grml64-small" build_command+=" CHROOT_OUTPUT=/root/grml_chroot" -build_command+=" FAI_DEBOOTSTRAP='${osversion} ${debian_bootstrap_url}'" +build_command+=" BOOTSTRAP_MIRROR=${debian_bootstrap_url}'" build_command+=" LIVE_CONF=/code/grml-live/etc/grml/grml-live.conf" build_command+=" GRML_FAI_CONFIG=${fai_config}" build_command+=" ./grml-live" build_command+=" -s '${osversion}'" build_command+=" -a amd64" build_command+=" -i '${iso_image_name}'" -build_command+=" -c GRMLBASE,SIPWISE,AMD64,PUPPETLABS" -build_command+=" -t /code/grml-live/templates/" +build_command+=" -c SIPWISE,PUPPETLABS" build_command+=" -o /grml/" build_command+=" -r 'grml-sipwise-${osversion}'" build_command+=" -v '${release}'" +build_command+=" -R" build_command+=" -F" build_command+=" && cd /grml/grml_isos/" build_command+=" && sha1sum '${iso_image_name}' > '${iso_image_name}.sha1'"