From: Michael Gebetsroither <michael@mgeb.org>
Date: Wed, 29 Sep 2010 16:21:20 +0000 (+0200)
Subject: Merge remote branch 'origin/mika/do-not-build-initrd'
X-Git-Tag: v0.99.11~5
X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=commitdiff_plain;h=35c6967bed313e653934d8f49ea5b85e333c16e3;hp=4eb13987d5ee2347fc6bd38e43967930cf5bd24b

Merge remote branch 'origin/mika/do-not-build-initrd'

Signed-off-by: Michael Gebetsroither <michael@mgeb.org>
---

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index ff3a40e..9eefd4f 100755
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -114,58 +114,24 @@ function actionAutoconf
 }
 # }}}
 
-
 # INITRD {{{
 function actionMkInitrd
 {
-  echo
-  echo "Creating initrd $PATH_/minirt26.gz:"
-  if isExistent "$PATH_/minirt26.gz" ; then
-     echo
-     echo "$PATH_/minirt26.gz exists already, skipping initrd creation"
-     return 0
-  fi
-
-  mkInitrd
-
-  echo '... done'
+  echo "Installing initrd $PATH_/minirt26.gz:"
+  # until we have a stable file location API let's use
+  # an according heuristic
+  for file in "$(find /live/image/boot -name initrd.gz)"; do
+    dir="$(dirname $file)"
+    if file "$dir"/linux26 | grep -q "$(uname -r)" ; then
+      cp -u "$dir"/initrd.gz "$PATH_"/minirt26.gz
+      echo '... done'
+      return 0
+    fi
+  done
 }
 
-function mkInitrd
-{
-  # we do not want to include persistent configuration files
-  # from udev in the initrd
-  udev_tmp_=$(mktemp -d terminalserver__udev.XXXXXX)
-  persistent=false
-  if ls /etc/udev/rules.d/*persistent* >/dev/null 2>&1 ; then
-    persistent_files=true
-    for f in /etc/udev/rules.d/*persistent* ; do
-      mv "$f" "${udev_tmp_}/"
-    done
-  fi
-
-  set -e
-  local cfg_="/etc/initramfs-tools/initramfs.conf"
-  local tmp_="`mktemp -t terminalserver__initramfsbk.XXXXXX`"
-  cp $cfg_ $tmp_
-  sed -i 's/^MODULES=.*/MODULES=netboot/' $cfg_
-  update-initramfs -u -t 1>/dev/null
-  mv $tmp_ $cfg_
-
-  local initrd_="/boot/initrd.img-$KERNEL_VERSION_"
-  mv $initrd_ $PATH_/minirt26.gz
-  mv ${initrd_}.bak $initrd_
-  set +e
-
-  # restore udev configuration files
-  if $persistent_files ; then
-    mv ${udev_tmp_}/* /etc/udev/rules.d/
-    rmdir "${udev_tmp_}"
-  fi
-}
 # }}}
 
-
 # INTERACTIVE CONFIGURATION  {{{
 
 function actionInteractive