From 6e778099dbc058de445abb455d50430161c54a38 Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <ch@grml.org>
Date: Sun, 11 Dec 2011 19:59:39 +0100
Subject: [PATCH 1/1] Merge initramfs scripts

---
 .../config/scripts/GRMLBASE/10-configure-initramfs | 23 ----------------------
 .../GRMLBASE/{47-initramfs => 80-initramfs}        | 12 +++++++++--
 2 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100755 etc/grml/fai/config/scripts/GRMLBASE/10-configure-initramfs
 rename etc/grml/fai/config/scripts/GRMLBASE/{47-initramfs => 80-initramfs} (59%)

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/10-configure-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/10-configure-initramfs
deleted file mode 100755
index cccfb77..0000000
--- a/etc/grml/fai/config/scripts/GRMLBASE/10-configure-initramfs
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/10-build-initramfs
-# Purpose:       configure live-initramfs and build initramfs for booting
-# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@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
-
-fcopy -v /etc/initramfs-tools/hooks/000-udev-shutup
-fcopy -v /etc/initramfs-tools/conf.d/xz-compress
-
-if ! [ -f $target/usr/share/initramfs-tools/scripts/live ] ; then
-  echo "Error: live-boot/-initramfs does not seem to be present, can not create initramfs. Exiting.">&2
-  exit 1
-fi
-
-# The initramfs itself will be created through grml-live script itself.
-
-## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/47-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/80-initramfs
similarity index 59%
rename from etc/grml/fai/config/scripts/GRMLBASE/47-initramfs
rename to etc/grml/fai/config/scripts/GRMLBASE/80-initramfs
index 2302584..b2b0879 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/47-initramfs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/80-initramfs
@@ -1,6 +1,6 @@
 #!/bin/sh
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/47-initramfs
-# Purpose:       Rebuild initramfs in chroot
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/80-initramfs
+# Purpose:       configure initramfs and rebuild it
 # 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.
@@ -9,6 +9,14 @@
 set -u
 set -e
 
+fcopy -v /etc/initramfs-tools/hooks/000-udev-shutup
+fcopy -v /etc/initramfs-tools/conf.d/xz-compress
+
+if ! [ -f $target/usr/share/initramfs-tools/scripts/live ] ; then
+  echo "Error: live-boot/-initramfs does not seem to be present, can not create initramfs. Exiting.">&2
+  exit 1
+fi
+
 echo "Rebuilding initramfs"
 
 for initrd in "$(basename $target/boot/vmlinuz-*)" ; do
-- 
2.1.4