summaryrefslogtreecommitdiff
path: root/libre/mksyslinux/mksyslinux
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-05 12:17:57 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-05 12:17:57 -0300
commit8da103e14072dc4cc04231cbca851293f7185e74 (patch)
tree1a0f7e344d43adc0c33f631879cae8e413c62068 /libre/mksyslinux/mksyslinux
parent3de2ae3dbc1389aa8ec71843924349bfb9a66a5c (diff)
mksyslinux-2013.06-1: updating version
Diffstat (limited to 'libre/mksyslinux/mksyslinux')
-rwxr-xr-xlibre/mksyslinux/mksyslinux7
1 files changed, 4 insertions, 3 deletions
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}