summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2004-04-17 16:30:42 +0000
committerJeremy Katz <katzj@redhat.com>2004-04-17 16:30:42 +0000
commit144f80af4df4c25cbc7759b94f7ff5e5435f3bfc (patch)
treee7a6df740ac69620c34cc9b8e49f7c64b1a9833c /scripts
parentf939af9fc56b2b48655b4d1a84648fd421da0161 (diff)
use syslinux-nomtools instead of the new mtools based syslinux installer
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mk-images.i3866
-rw-r--r--scripts/mk-images.x86_646
2 files changed, 10 insertions, 2 deletions
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index e782531dd..8f3fda579 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -1,8 +1,12 @@
-SYSLINUX=$IMGPATH/usr/bin/syslinux
+SYSLINUX=$IMGPATH/usr/lib/syslinux/syslinux-nomtools
if [ ! -f $SYSLINUX ]; then
+ echo "Warning: nomtools syslinux doesn't exist"
+ SYSLINUX=$IMGPATH/usr/bin/syslinux
+ if [ ! -f $SYSLINUX ]; then
echo "$SYSLINUX doesn't exist"
exit 1
+ fi
fi
prepareBootImage() {
diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64
index 69ccedf19..36f17e8af 100644
--- a/scripts/mk-images.x86_64
+++ b/scripts/mk-images.x86_64
@@ -1,8 +1,12 @@
-SYSLINUX=$IMGPATH/usr/bin/syslinux
+SYSLINUX=$IMGPATH/usr/lib/syslinux/syslinux-nomtools
if [ ! -f $SYSLINUX ]; then
+ echo "Warning: nomtools syslinux doesn't exist"
+ SYSLINUX=$IMGPATH/usr/bin/syslinux
+ if [ ! -f $SYSLINUX ]; then
echo "$SYSLINUX doesn't exist"
exit 1
+ fi
fi
# prepare a directory with the kernel, initrd, and various message files