From 1de9c3dffc019eb5ec3ecbe7e32a5bad490271a3 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tobias@T-POWA-LX.(none)>
Date: Sun, 26 Apr 2009 18:31:30 +0200
Subject: [PATCH] 'changed syslinux invocation'

---
 lib/initcpio/install/arch_core_install |  2 +-
 lib/initcpio/install/arch_pacman       |  2 +-
 lib/initcpio/install/arch_syslinux     |  2 +-
 usr/bin/archboot-svn.sh                |  2 +-
 usr/share/archboot/installer/setup     | 11 ++++-------
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lib/initcpio/install/arch_core_install b/lib/initcpio/install/arch_core_install
index 05d11b56c..6b6aabf18 100644
--- a/lib/initcpio/install/arch_core_install
+++ b/lib/initcpio/install/arch_core_install
@@ -44,7 +44,7 @@ install ()
 		DEVEL="$DEVEL $(echo $i)"
 	done
 	SUPPORT=""
-	SUPPORT="$(echo -n $(pacman -Ss | grep -e ^core | grep -v '(' | sed -e 's/\ .*/ /g' -e 's#core/##g')) ntfs-3g syslinux dhclient"
+	SUPPORT="$(echo -n $(pacman -Ss | grep -e ^core | grep -v '(' | sed -e 's/\ .*/ /g' -e 's#core/##g')) ntfs-3g dhclient"
 	for i in base devel lib support; do
 	    mkdir $i
 	    svn co -N ${SVNSETUP} $i
diff --git a/lib/initcpio/install/arch_pacman b/lib/initcpio/install/arch_pacman
index 8cd53c556..57a949356 100644
--- a/lib/initcpio/install/arch_pacman
+++ b/lib/initcpio/install/arch_pacman
@@ -20,7 +20,7 @@ pcre cpio archboot fuse klibc libusb vi lzo2 libsasl libldap libevent gpm sdparm
 rt2x00-rt61-fw rt2x00-rt71w-fw rt2500 ndiswrapper ndiswrapper-utils \
 zd1211-firmware ipw2100-fw ipw2200-fw iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode \
 smbclient tdb tiacx tiacx-firmware dmraid linux-atm netcfg tiacx tiacx-firmware parted tzdata ntp \
-v86d wlan-ng26-utils iw crda wireless-regdb libnl iproute2 dhclient syslinux"
+v86d wlan-ng26-utils iw crda wireless-regdb libnl iproute2 dhclient syslinux mtools"
 
 for i in $DEPENDS; do
 	for k in  $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do
diff --git a/lib/initcpio/install/arch_syslinux b/lib/initcpio/install/arch_syslinux
index dc98c7513..f6afc4181 100644
--- a/lib/initcpio/install/arch_syslinux
+++ b/lib/initcpio/install/arch_syslinux
@@ -3,7 +3,7 @@
 install ()
 {
     MODULES=""
-    BINARIES="syslinux"
+    BINARIES="syslinux mcopy"
     FILES=""
     SCRIPT=""
     add_file "/usr/lib/syslinux/mbr.bin"
diff --git a/usr/bin/archboot-svn.sh b/usr/bin/archboot-svn.sh
index b32168960..e43fbc485 100644
--- a/usr/bin/archboot-svn.sh
+++ b/usr/bin/archboot-svn.sh
@@ -13,7 +13,7 @@ for i in $(pacman -Sg base-devel | sed -e "s/base-devel//g"); do
 	DEVEL="$DEVEL $(echo $i)"
 done
 # generate support, ntfs-3g is added additionally!
-SUPPORT="$(echo -n $(pacman -Ss | grep -e ^core | grep -v '(' | sed -e 's/\ .*/ /g' -e 's#core/##g')) ntfs-3g syslinux dhclient"
+SUPPORT="$(echo -n $(pacman -Ss | grep -e ^core | grep -v '(' | sed -e 's/\ .*/ /g' -e 's#core/##g')) ntfs-3g dhclient"
 for i in base devel support; do
     mkdir $i
     svn co -N ${SVNSETUP} $i
diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 403bf342b..7fe507e31 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -2080,7 +2080,7 @@ dosyslinux() {
     getrootfs
     getraidarrays
     getcryptsetup
-    if [ ! -e $DESTDIR/usr/bin/syslinux ]; then
+    if [ ! -e /usr/bin/syslinux ]; then
         DIALOG --msgbox "Error: Couldn't find syslinux binary.  Is SYSLINUX installed?" 0 0
         return 1
     fi
@@ -2105,7 +2105,7 @@ dosyslinux() {
     ROOTDEV=$(cat $ANSWER)
     # generate syslinux.cfg
     TEMPDIR=/tmp
-    MBR=${DESTDIR}/usr/lib/syslinux/mbr.bin
+    MBR=/usr/lib/syslinux/mbr.bin
     [ -e ${TEMPDIR}/syslinux.cfg ] && rm ${TEMPDIR}/syslinux.cfg
     echo "prompt 1" >> ${TEMPDIR}/syslinux.cfg
     echo "timeout 300" >> ${TEMPDIR}/syslinux.cfg
@@ -2128,14 +2128,11 @@ dosyslinux() {
     DIALOG --infobox "Installing the SYSLINUX bootloader..." 0 0
     cp  ${TEMPDIR}/syslinux.cfg ${DESTDIR}/boot/syslinux.cfg
     cat ${MBR} > ${ROOTDEV}
-    chroot_mount
-    chroot $DESTDIR /usr/bin/syslinux -o offset $bootdev >$LOG 2>&1
+    syslinux -o offset $bootdev >$LOG 2>&1
     if [ $? -gt 0 ]; then
-        chroot_umount
         DIALOG --msgbox "Error installing SYSLINUX. (see $LOG for output)" 0 0
         return 1
     fi
-    chroot_umount
     DIALOG --msgbox "SYSLINUX was successfully installed." 0 0
 }
 
@@ -2941,7 +2938,7 @@ install_bootloader()
 {
     CANCEL=""
     DIALOG --menu "Which bootloader would you like to use?  Grub is the Arch default.\n\n" \
-        10 55 2 \
+        12 55 3 \
         "GRUB" "Use the GRUB bootloader (default)" \
         "LILO" "Use the LILO bootloader" \
         "SYSLINUX" "Use the SYSLINUX bootloader" 2>$ANSWER || CANCEL=1