summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/mksyslinux/PKGBUILD8
-rwxr-xr-xlibre/mksyslinux/mksyslinux7
-rw-r--r--libre/mksyslinux/mksyslinux.conf2
3 files changed, 9 insertions, 8 deletions
diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD
index 16d595f12..a64f141fd 100644
--- a/libre/mksyslinux/PKGBUILD
+++ b/libre/mksyslinux/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 186874 2013-05-31 13:27:18Z tpowa $
+# $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $
# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
pkgname=mksyslinux
-pkgver=2013.05
+pkgver=2013.06
pkgrel=1
pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)"
arch=(any)
@@ -21,6 +21,6 @@ package()
install -D -m644 options.msg "$pkgdir/usr/share/mksyslinux/options.msg"
}
md5sums=('287aad9693ca8061495e248c41ba43a7'
- 'd958575945e4ce8a9002bd056e2f14be'
- '1f1e2d80e28b087e4103282bc5c44071'
+ '0a9fd93356b5d98ab386f28bc849b808'
+ '15742e47e40a46491694b4b7680d4e38'
'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux
index 4db771f83..96ad45133 100755
--- a/libre/mksyslinux/mksyslinux
+++ b/libre/mksyslinux/mksyslinux
@@ -71,13 +71,14 @@ export RUNPROGRAM="${APPNAME}"
export USEKERNEL=${VERSION}
# begin script
[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR}
-mkdir -p ${TEMPDIR}/$BOOTDIRNAME
+mkdir -p ${TEMPDIR}
echo ":: Mounting ${DEVICE} ..."
if ! [ "${IMAGENAME}" = "" ]; then
modprobe loop
else
mount ${DEVICE} ${TEMPDIR} || exit 1
fi
+mkdir -p ${TEMPDIR}/${BOOTDIRNAME}
# prepare syslinux bootloader
install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
for i in /usr/lib/syslinux/*.c32; do
@@ -102,7 +103,7 @@ else
sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
fi
-[ ! -s ${TEMPDIR}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1
+[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1
echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..."
# generate initramdisk
echo ":: Creating initramdisk ..."
@@ -136,7 +137,7 @@ else
echo ":: Installing MBR on ${MBRDEVICE} ..."
cat ${MBR} > ${MBRDEVICE}
echo ":: Installing SYSLINUX on ${DEVICE} ..."
- syslinux -o offset ${DEVICE} && echo "Installation completed."
+ syslinux -t offset ${DEVICE} && echo "Installation completed."
fi
# clean /tmp
rm -r ${TEMPDIR}
diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf
index ab2d4978a..cfbfc49d8 100644
--- a/libre/mksyslinux/mksyslinux.conf
+++ b/libre/mksyslinux/mksyslinux.conf
@@ -20,7 +20,7 @@ KERNEL="/boot/vmlinuz-linux-libre"
BOOTMESSAGE="/usr/share/mksyslinux/boot.msg"
OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg"
-syslinux.cfg file to use
+# syslinux.cfg file to use
SYSLINUXCFG=""
# Prompt on boot, 1=yes 0=no