[Fai-commit] r6018 - in branches/stable/3.4: bin debian

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:56:49 +0000 (Tue, 17 Aug 2010)
New Revision: 6018

Modified:
   branches/stable/3.4/bin/fai-cd
   branches/stable/3.4/debian/changelog
Log:
fai-cd: fix, use grub.cfg for grub2


Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/bin/fai-cd
===================================================================
--- branches/stable/3.4/bin/fai-cd	2010-08-17 12:56:44 UTC (rev 6017)
+++ branches/stable/3.4/bin/fai-cd	2010-08-17 12:56:49 UTC (rev 6018)
@@ -404,7 +404,12 @@
     else
 	grub_config="$cfdir/menu.lst" # set default if undefined
     fi
+
+    if [ "$grub_version" -eq 2 ]; then
+	grub_config="$cfdir/grub.cfg" # set default if undefined
+    fi
 fi
+
 # if grub_config contains / do not change it, else add prefix $cfdir
 echo $grub_config | grep -q '/' || grub_config="$cfdir/$grub_config"
 [ -f "$grub_config" ] || die 13 "Grub menu file $grub_config not found."

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:56:44 UTC (rev 6017)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:56:49 UTC (rev 6018)
@@ -1,4 +1,4 @@
-fai (3.4~beta8) unstable; urgency=low
+fai (3.4~beta9) unstable; urgency=low
 
   [ Thomas Lange ]
   * get-config-dir-http: new script to get a tarball of the config space
@@ -94,7 +94,8 @@
     $FAI_ROOT, so let's get rid of them outside the chroot as well iff
     they are present
   * fai-cd: add checks if package download succeeded
-
+  * fai-cd: fix, use grub.cfg for grub2
+  
  -- Thomas Lange <lange at debian.org>  Wed, 28 Jul 2010 16:28:51 -0400
 
 fai (3.3.5) unstable; urgency=high