Package: dfsbuild
Version: 0.99.2
Followup-For: Bug #404563

Hi,
the attached patch scans both /usr/lib/grub and /lib/grub for the grub
bootloader files.
This resolves the copy-grubfile bug for me.

regards,
Lars

-- System Information:
Debian Release: 4.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)

Versions of packages dfsbuild depends on:
ii  cdebootstrap              0.3.15         Bootstrap a Debian system
ii  cramfsprogs               1.1-6          Tools for CramFs (Compressed ROM F
ii  debconf [debconf-2.0]     1.5.11         Debian configuration management sy
ii  grub                      0.97-20        GRand Unified Bootloader
ii  libc6                     2.3.6.ds1-8    GNU C Library: Shared libraries
ii  libgmp3c2                 2:4.2.1+dfsg-4 Multiprecision arithmetic library
ii  mkisofs                   9:1.1.0-1      Dummy transition package for genis
ii  reprepro                  1.3.1-1        debian package repository producer
ii  ucf                       2.0017         Update Configuration File: preserv

dfsbuild recommends no packages.

-- no debconf information
diff -ruN dfsbuild.orig/dfsbuild-0.99.2/Bootloader/Grub.hs 
dfsbuild/dfsbuild-0.99.2/Bootloader/Grub.hs
--- dfsbuild.orig/dfsbuild-0.99.2/Bootloader/Grub.hs    2006-04-20 
00:10:11.000000000 +0200
+++ dfsbuild/dfsbuild-0.99.2/Bootloader/Grub.hs 2007-01-02 00:56:45.000000000 
+0100
@@ -40,8 +40,11 @@
 
 grub_generic env =
     do createDirectory (targetdir env ++ "/boot/grub") 0o755
-       grubfiles <- glob "/lib/grub/*/*"
-       safeSystem "cp" $ ["-rv"] ++ grubfiles ++ [targetdir env ++ 
"/boot/grub/"]
+          -- since etch (Debian 4.0) grub files are located in /usr/lib 
instead of /lib
+       grubfiles_pre_etch <- glob "/lib/grub/*/*"
+       grubfiles_since_etch <- glob "/usr/lib/grub/*/*"
+       safeSystem "cp" $ ["-rv"] ++ grubfiles_pre_etch ++ grubfiles_since_etch 
++
+         [targetdir env ++ "/boot/grub/"]
        menuText <- grubMenu env
        writeFile (targetdir env ++ "/boot/grub/menu.lst") menuText
 

Reply via email to