diff options
| author | jonas <jonas@8f53b18a-e215-0410-8885-9f593d34873e> | 2006-10-14 14:24:01 +0000 |
|---|---|---|
| committer | jonas <jonas@8f53b18a-e215-0410-8885-9f593d34873e> | 2006-10-14 14:24:01 +0000 |
| commit | acdcf22d588a5e28633d8519e6196f035d083864 (patch) | |
| tree | 73547111b3d5788fe72cfa61b347d89e9f1eca67 | |
| parent | c775f3b488cd415141bd0e0b76e28a706d419073 (diff) | |
Support GRB libs stored below /usr/lib (as is the case with most recent packages.
git-svn-id: svn+ssh://xayide/home/jonas/private_svn/fleshybrid/homebase@40 8f53b18a-e215-0410-8885-9f593d34873e
| -rwxr-xr-x | 1_makerootfs.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/1_makerootfs.sh b/1_makerootfs.sh index 84ec475..94157c8 100755 --- a/1_makerootfs.sh +++ b/1_makerootfs.sh @@ -152,7 +152,13 @@ if [ -n "$grubdev_host" ]; then # Prepare GRUB install mkdir -p "$targettemp/boot/grub" mkgrubdevmap "$usbdev_target" > "$targettemp/boot/grub/device.map" - cp -af "$targettemp/lib/grub/i386-pc/"* "$targettemp/boot/grub" + # Recent GRUB packages store libraries below /usr/lib + if [ -d "$targettemp/lib/grub/i386-pc/" ]; then + grublibs="/lib/grub/i386-pc" + else + grublibs="/usr/lib/grub/i386-pc" + fi + cp -af "$targettemp/$grublibs/"* "$targettemp/boot/grub" # FIXME: Invent a hook wrapping both this and other bootloaders preserveandaddlines "$targettemp/etc/kernel-img.conf" orig 1 "postinst_hook = /sbin/update-grub" "postrm_hook = /sbin/update-grub" # preserveandaddlines "$targettemp/boot/grub/menu.lst" orig 1 "default 0" "timeout 5" "color cyan/blue white/blue" |