diff options
| author | Andi Kleen <ak@suse.de> | 2006-06-26 13:58:41 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 10:48:19 -0700 |
| commit | bf660254e0d430e5d991e432d5dad8d6714828f6 (patch) | |
| tree | 42955c823512e3f0655128c297c7f1ccac78831a /arch/x86_64 | |
| parent | 2f82bde472184f989283c173c1eb95bab455a774 (diff) | |
| download | linux-bf660254e0d430e5d991e432d5dad8d6714828f6.tar.gz linux-bf660254e0d430e5d991e432d5dad8d6714828f6.tar.bz2 linux-bf660254e0d430e5d991e432d5dad8d6714828f6.zip | |
[PATCH] i386/x86-64: Fix isoimage when syslinux is in /usr/share
It's like this on SUSE systems.
Cc: hpa@zytor.com
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/boot/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86_64/boot/Makefile b/arch/x86_64/boot/Makefile index 43ee6c50c277..deb063e7762d 100644 --- a/arch/x86_64/boot/Makefile +++ b/arch/x86_64/boot/Makefile @@ -107,8 +107,13 @@ fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf isoimage: $(BOOTIMAGE) -rm -rf $(obj)/isoimage mkdir $(obj)/isoimage - cp `echo /usr/lib*/syslinux/isolinux.bin | awk '{ print $1; }'` \ - $(obj)/isoimage + for i in lib lib64 share end ; do \ + if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \ + cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \ + break ; \ + fi ; \ + if [ $$i = end ] ; then exit 1 ; fi ; \ + done cp $(BOOTIMAGE) $(obj)/isoimage/linux echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg if [ -f '$(FDINITRD)' ] ; then \ |