diff options
| author | Andi Kleen <ak@suse.de> | 2006-06-26 07:58:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 13:48:19 -0400 |
| commit | bf660254e0d430e5d991e432d5dad8d6714828f6 (patch) | |
| tree | 42955c823512e3f0655128c297c7f1ccac78831a | |
| parent | 2f82bde472184f989283c173c1eb95bab455a774 (diff) | |
[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>
| -rw-r--r-- | arch/i386/boot/Makefile | 9 | ||||
| -rw-r--r-- | arch/x86_64/boot/Makefile | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile index 33e55476381b..e97946626064 100644 --- a/arch/i386/boot/Makefile +++ b/arch/i386/boot/Makefile | |||
| @@ -109,8 +109,13 @@ fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf | |||
| 109 | isoimage: $(BOOTIMAGE) | 109 | isoimage: $(BOOTIMAGE) |
| 110 | -rm -rf $(obj)/isoimage | 110 | -rm -rf $(obj)/isoimage |
| 111 | mkdir $(obj)/isoimage | 111 | mkdir $(obj)/isoimage |
| 112 | cp `echo /usr/lib*/syslinux/isolinux.bin | awk '{ print $1; }'` \ | 112 | for i in lib lib64 share end ; do \ |
| 113 | $(obj)/isoimage | 113 | if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \ |
| 114 | cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \ | ||
| 115 | break ; \ | ||
| 116 | fi ; \ | ||
| 117 | if [ $$i = end ] ; then exit 1 ; fi ; \ | ||
| 118 | done | ||
| 114 | cp $(BOOTIMAGE) $(obj)/isoimage/linux | 119 | cp $(BOOTIMAGE) $(obj)/isoimage/linux |
| 115 | echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg | 120 | echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg |
| 116 | if [ -f '$(FDINITRD)' ] ; then \ | 121 | if [ -f '$(FDINITRD)' ] ; then \ |
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 | |||
| 107 | isoimage: $(BOOTIMAGE) | 107 | isoimage: $(BOOTIMAGE) |
| 108 | -rm -rf $(obj)/isoimage | 108 | -rm -rf $(obj)/isoimage |
| 109 | mkdir $(obj)/isoimage | 109 | mkdir $(obj)/isoimage |
| 110 | cp `echo /usr/lib*/syslinux/isolinux.bin | awk '{ print $1; }'` \ | 110 | for i in lib lib64 share end ; do \ |
| 111 | $(obj)/isoimage | 111 | if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \ |
| 112 | cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \ | ||
| 113 | break ; \ | ||
| 114 | fi ; \ | ||
| 115 | if [ $$i = end ] ; then exit 1 ; fi ; \ | ||
| 116 | done | ||
| 112 | cp $(BOOTIMAGE) $(obj)/isoimage/linux | 117 | cp $(BOOTIMAGE) $(obj)/isoimage/linux |
| 113 | echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg | 118 | echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg |
| 114 | if [ -f '$(FDINITRD)' ] ; then \ | 119 | if [ -f '$(FDINITRD)' ] ; then \ |