[Fai-commit] r3278 - trunk/bin

[fai-repository at svn.debian.org]

Author: lange
Date: 2006-03-05 16:48:57 +0000 (Sun, 05 Mar 2006)
New Revision: 3278

Modified:
   trunk/bin/make-fai-nfsroot
Log:
detect kernel version for new kernel name (closes: 352939),
remove patches-* file when using -K


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-03-01 18:22:05 UTC (rev 3277)
+++ trunk/bin/make-fai-nfsroot	2006-03-05 16:48:57 UTC (rev 3278)
@@ -6,7 +6,7 @@
 # make-fai-nfsroot -- create nfsroot directory and add additional packages
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2000-2005 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2000-2006 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 #
 #*********************************************************************
@@ -363,7 +363,10 @@
 get_kernel_version() {
 
     local package=$1
-    KERNELVERSION=`dpkg --info $package | grep "Package: kernel-image" | sed -e 's/.*kernel-image-'//`
+    local a
+
+    KERNELVERSION=`dpkg --info $package | grep ' Package: '`
+    KERNELVERSION=${KERNELVERSION/*-image-/}
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 setup_bootp(){
@@ -441,7 +444,7 @@
 # remove all kernels from nfsroot
 [ -n "$kremove" ] && {
     echo "Removing all kernels from NFSROOT."
-    rm -f $NFSROOT/boot/{System.map,vmlinuz,config}*
+    rm -f $NFSROOT/boot/{System.map,vmlinuz,config,patches}*
     rm -rf $NFSROOT/lib/modules/2.*
 }