[arch-commits] Commit in mksyslinux/trunk (PKGBUILD mksyslinux mksyslinux.conf)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Tue Jun 4 06:46:40 UTC 2013
Date: Tuesday, June 4, 2013 @ 08:46:39
Author: tpowa
Revision: 187120
upgpkg: mksyslinux 2013.06-1
fix some paths, config files and syslinux -o
Modified:
mksyslinux/trunk/PKGBUILD
mksyslinux/trunk/mksyslinux
mksyslinux/trunk/mksyslinux.conf
-----------------+
PKGBUILD | 6 +++---
mksyslinux | 7 ++++---
mksyslinux.conf | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-06-04 06:44:44 UTC (rev 187119)
+++ PKGBUILD 2013-06-04 06:46:39 UTC (rev 187120)
@@ -2,7 +2,7 @@
# Maintainer : Tobias Powalowski <tpowa at archlinux.org>
pkgname=mksyslinux
-pkgver=2013.05
+pkgver=2013.06
pkgrel=1
pkgdesc="Advanced, modular syslinux boot image creation utility"
arch=(any)
@@ -21,6 +21,6 @@
install -D -m644 options.msg "$pkgdir/usr/share/mksyslinux/options.msg"
}
md5sums=('6a269fc5b58c7bcc6688efeaa2075606'
- 'fa5443022923fa0e2ebbbe127be621d6'
- '67e7c685e8ed30e723187b28a5e21b96'
+ '5388bd1d69b03f20bcd26d08da11bcf5'
+ '6b37cb9cb766a5f6482908c5248233c6'
'b211c5f7e30d2ee36cde20f71aa3f2b8')
Modified: mksyslinux
===================================================================
--- mksyslinux 2013-06-04 06:44:44 UTC (rev 187119)
+++ mksyslinux 2013-06-04 06:46:39 UTC (rev 187120)
@@ -71,13 +71,14 @@
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 @@
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 @@
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}
Modified: mksyslinux.conf
===================================================================
--- mksyslinux.conf 2013-06-04 06:44:44 UTC (rev 187119)
+++ mksyslinux.conf 2013-06-04 06:46:39 UTC (rev 187120)
@@ -19,7 +19,7 @@
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
More information about the arch-commits
mailing list