From: Ulrich Dangel <mru@grml.org>
Date: Sun, 11 Dec 2011 04:38:26 +0000 (+0100)
Subject: Update /etc/grml_version in GRMLBASE script instead of grml-live
X-Git-Tag: v0.17.1~51
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=7c309e00912077acf0b15bce0f27eec4dd055058

Update /etc/grml_version in GRMLBASE script instead of grml-live

[ch: Initramfs update has been moved into a GRMLBASE script, too.]
---

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/46-grml-version b/etc/grml/fai/config/scripts/GRMLBASE/46-grml-version
new file mode 100755
index 0000000..c017ccd
--- /dev/null
+++ b/etc/grml/fai/config/scripts/GRMLBASE/46-grml-version
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/46-grml-version
+# Purpose:       Update grml version in the chroot
+# Authors:       grml-team (grml.org)
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2 or any later version.
+################################################################################
+
+set -u
+set -e
+. "$GRML_LIVE_CONFIG"
+
+echo "Setting /etc/grml_version to $GRML_NAME $VERSION Release Codename $RELEASENAME [$DATE]"
+echo "$GRML_NAME $VERSION Release Codename $RELEASENAME [$DATE]" > $target/etc/grml_version
+chmod 644 $target/etc/grml_version
+
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/47-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/47-initramfs
new file mode 100755
index 0000000..2302584
--- /dev/null
+++ b/etc/grml/fai/config/scripts/GRMLBASE/47-initramfs
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/47-initramfs
+# Purpose:       Rebuild initramfs in chroot
+# Authors:       grml-team (grml.org)
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2 or any later version.
+################################################################################
+
+set -u
+set -e
+
+echo "Rebuilding initramfs"
+
+for initrd in "$(basename $target/boot/vmlinuz-*)" ; do
+    if ! $ROOTCMD update-initramfs -k "${initrd##vmlinuz-}" -c ; then
+        echo "Creating fresh initrd did not work, trying update instead:"
+        $ROOTCMD update-initramfs -k "${initrd##vmlinuz-}" -u
+    fi
+done
diff --git a/grml-live b/grml-live
index 9a1cd94..525011d 100755
--- a/grml-live
+++ b/grml-live
@@ -655,24 +655,6 @@ else
          log    "Error: critical error while executing fai [exit code ${RC}]. Exiting."
          eerror "Error: critical error while executing fai [exit code ${RC}]. Exiting." ; eend 1
          bailout 1
-      else
-         einfo "Setting /etc/grml_version to $GRML_NAME $VERSION Release Codename $RELEASENAME [$DATE]"
-         log   "Setting /etc/grml_version to $GRML_NAME $VERSION Release Codename $RELEASENAME [$DATE]"
-         echo "$GRML_NAME $VERSION Release Codename $RELEASENAME [$DATE]" > $CHROOT_OUTPUT/etc/grml_version
-         chmod 644 $CHROOT_OUTPUT/etc/grml_version
-         einfo "Rebuilding initramfs"
-         # make sure new /etc/grml_version reaches initramfs, iterate over all
-         # present kernel versions (note: we can't really handle more than one
-         # kernel version anyway right now)
-         # chroot $CHROOT_OUTPUT update-initramfs -u -t => might break when using kernel-package :(
-         for initrd in "$(basename $CHROOT_OUTPUT/boot/vmlinuz-*)" ; do
-           if ! chroot $CHROOT_OUTPUT update-initramfs -k "${initrd##vmlinuz-}" -c ; then
-             einfo "Creating fresh initrd did not work, trying update instead:"
-             log   "Creating fresh initrd did not work, trying update instead:"
-             chroot $CHROOT_OUTPUT update-initramfs -k "${initrd##vmlinuz-}" -u
-           fi
-         done
-         eend $?
       fi
 
       # move fai logs into grml_logs directory