From 47787b394ff68725628be11e109fe385aa4799b1 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 20 Oct 2013 01:08:36 -0200 Subject: syslinux-6.02-3: updating version --- libre/syslinux/PKGBUILD | 193 ++++++++++++++++----- .../syslinux/syslinux-6.00-efi-export-kbdmap.patch | 38 ++++ .../syslinux/syslinux-6.00-efi-fix-libcom32.patch | 45 +++++ .../syslinux/syslinux-6.02-fix-chainloading.patch | 47 +++++ .../syslinux-dont-build-dos-windows-targets.patch | 6 +- libre/syslinux/syslinux-install_update | 104 ++++++----- libre/syslinux/syslinux.cfg | 31 ++-- libre/syslinux/syslinux.install | 25 ++- 8 files changed, 377 insertions(+), 112 deletions(-) create mode 100644 libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch create mode 100644 libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch create mode 100644 libre/syslinux/syslinux-6.02-fix-chainloading.patch (limited to 'libre/syslinux') diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index 01505c5d2..a2ca4c657 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -1,57 +1,172 @@ -# Maintainer: Thomas Bächler # Maintainer: Tobias Powalowski +# Maintainer: Thomas Bächler +# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva -pkgname=syslinux -pkgver=4.07 -pkgrel=1.1 -arch=('i686' 'x86_64') +pkgname="syslinux" +pkgver="6.02" +pkgrel="3" +arch=('x86_64' 'i686') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" license=('GPL2') +options=('!makeflags' '!emptydirs') +backup=('boot/syslinux/syslinux.cfg' + 'boot/syslinux/splash.png') +makedepends=('python2' 'nasm' 'gnu-efi-libs') depends=('perl' 'glibc') optdepends=('perl-passwd-md5: For md5pass' 'perl-digest-sha1: For sha1pass' 'mtools: For mkdiskimage and syslinux support' 'gptfdisk: For GPT support' - 'util-linux: For isohybrid') -makedepends=('nasm') -backup=('boot/syslinux/syslinux.cfg' - 'boot/syslinux/splash.png') -install=syslinux.install -source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2 - syslinux-dont-build-dos-windows-targets.patch - syslinux.cfg - syslinux-install_update - splash.png) -md5sums=('9ff6e1b94efab931fb4717b600d88779' - '1528c376e43f0eaccaa80d8ad1bc13b4' - 'a43bd903face611bcc148522265dfe6c' - '8559fb3daf3afa8688600d8a38118918' + 'util-linux: For isohybrid' + 'efibootmgr: For EFI support' + 'dosfstools: For EFI support') +md5sums=('6f275813a1b08cf852e55c0a3f8fbc78' + 'f048880b57e2c5a7017ff8804bfda327' + '0e7d47e1f791f0c5e7bd40ed5c6d80cc' + '9dbede6b71a4de9e46aac4aad65334d7' 'cb46ca47c6b6323127d908440057d98f') +install="${pkgname}.install" + +source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz" + 'syslinux.cfg' + 'syslinux-install_update' + 'syslinux-6.02-fix-chainloading.patch' + 'splash.png') + +_build_syslinux_bios() { + + rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true + cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-bios" + cd "${srcdir}/${pkgname}-${pkgver}-bios/" + + ## Do not try to build syslinux with our default LDFLAGS, it will fail + unset LDFLAGS + make PYTHON="python2" bios + make PYTHON="python2" bios installer +} + +_build_syslinux_efi64() { + + rm -rf "${srcdir}/${pkgname}-${pkgver}-efi64/" || true + cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi64" + cd "${srcdir}/${pkgname}-${pkgver}-efi64/" + + ## Unset all compiler FLAGS for efi64 build + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + make PYTHON="python2" efi64 + make PYTHON="python2" efi64 installer +} + +_build_syslinux_efi32() { + + rm -rf "${srcdir}/${pkgname}-${pkgver}-efi32/" || true + cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi32" + cd "${srcdir}/${pkgname}-${pkgver}-efi32/" + + ## Unset all compiler FLAGS for efi32 build + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + make PYTHON="python2" efi32 + make PYTHON="python2" efi32 installer +} + build() { - # Do not try to build syslinux with our default LDFLAGS, it will fail - unset LDFLAGS - cd "$srcdir"/$pkgname-${pkgver} - # Do not try to build the Windows or DOS installers - patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch - # Fix FHS manpage path - sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk - make installer - make -C utils - make -C com32 + + cd "${srcdir}/${pkgname}-${pkgver}/" + + ## Do not try to build the Windows or DOS installers and DIAG files + sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + + ## Fix FHS manpage path + sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true + + # fix chainloading + # http://bugzilla.syslinux.org/show_bug.cgi?id=31 + # http://www.syslinux.org/archives/2013-October/020971.html + patch -Np1 -i "${srcdir}/syslinux-6.02-fix-chainloading.patch" + + ## Build syslinux-efi + if [[ "${CARCH}" == "x86_64" ]]; then + _build_syslinux_efi64 + fi + + if [[ "${CARCH}" == "i686" ]]; then + _build_syslinux_efi32 + fi + + ## Build syslinux-bios + _build_syslinux_bios + +} + +_package_syslinux_bios() { + + cd "${srcdir}/${pkgname}-${pkgver}-bios/" + + ## Install Syslinux bios + make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" bios install + + ## Remove syslinux.exe,syslinux64.exe,syslinux.com and dosutil dir + rm "${pkgdir}/usr/lib/syslinux/bios"/syslinux.{com,exe} || true + rm "${pkgdir}/usr/lib/syslinux/bios/syslinux64.exe" || true + rm -rf "${pkgdir}/usr/lib/syslinux/bios/dosutil/" || true + + ## Remove com32 and diag dirs + rm -rf "${pkgdir}/usr/lib/syslinux/bios/diag/" || true + rm -rf "${pkgdir}/usr/lib/syslinux/bios/com32/" || true + + ## Move extlinux binary to /usr/bin + install -d "${pkgdir}/usr/bin" + mv "${pkgdir}/sbin/extlinux" "${pkgdir}/usr/bin/extlinux" + rm -rf "${pkgdir}/sbin/" + + ## Install docs + install -d "${pkgdir}/usr/share/doc" + cp -ar "${srcdir}/${pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux" + + ## Install the default configuration + install -D -m0644 "${srcdir}/syslinux.cfg" "${pkgdir}/boot/syslinux/syslinux.cfg" + + ## Install the installation and update script + ## This script is maintained at git://gist.github.com/772138.git + ## Script not yet updated for syslinux-efi + install -D -m0755 "${srcdir}/syslinux-install_update" "${pkgdir}/usr/bin/syslinux-install_update" + + # Install Parabola splash + install -D -m644 "${srcdir}/splash.png" "${pkgdir}/boot/syslinux/splash.png" } package() { - cd "$srcdir"/$pkgname-${pkgver} - make INSTALLROOT="$pkgdir" SBINDIR=/usr/bin AUXDIR=/usr/lib/syslinux install - - # Install the default configuration - install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg - # Install Parabola splash - install -D -m644 "$srcdir"/splash.png "$pkgdir"/boot/syslinux/splash.png - # Install the installation and update script - # This script is maintained at git://gist.github.com/772138.git - install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update + + cd "${srcdir}/${pkgname}-${pkgver}/" + + if [[ "${CARCH}" == "x86_64" ]]; then + cd "${srcdir}/${pkgname}-${pkgver}-efi64/" + make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi64 install + fi + + if [[ "${CARCH}" == "i686" ]]; then + cd "${srcdir}/${pkgname}-${pkgver}-efi32/" + make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install + fi + + _package_syslinux_bios + } diff --git a/libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch b/libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch new file mode 100644 index 000000000..cbcd9a6da --- /dev/null +++ b/libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch @@ -0,0 +1,38 @@ +From 2a81889c7d680fbe51de63dbbeb4e8c290ec46fa Mon Sep 17 00:00:00 2001 +From: Matt Fleming +Date: Fri, 21 Jun 2013 07:14:24 +0000 +Subject: efi: Tag symbols with __export + +I missed some symbols previously that are required to be exported when +loading vesamenu.c32. + +Signed-off-by: Matt Fleming +--- +diff --git a/efi/main.c b/efi/main.c +index 51ff9f3..71333a4 100644 +--- a/efi/main.c ++++ b/efi/main.c +@@ -21,7 +21,7 @@ uint32_t _IdleTimer = 0; + char __lowmem_heap[32]; + uint32_t BIOS_timer_next; + uint32_t timer_irq; +-uint8_t KbdMap[256]; ++__export uint8_t KbdMap[256]; + char aux_seg[256]; + + static inline EFI_STATUS +diff --git a/efi/vesa.c b/efi/vesa.c +index d259f60..b4a541b 100644 +--- a/efi/vesa.c ++++ b/efi/vesa.c +@@ -297,7 +297,7 @@ static int efi_vesacon_font_query(uint8_t **font) + return cp865_8x16_font_height; + } + +-int __vesacon_i915resolution(int x, int y) ++__export int __vesacon_i915resolution(int x, int y) + { + /* We don't support this function */ + return 1; +-- +cgit v0.9.2 diff --git a/libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch b/libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch new file mode 100644 index 000000000..7460cd195 --- /dev/null +++ b/libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch @@ -0,0 +1,45 @@ +From 013ef7679a573b3b3454f914f3a7f865991db9f2 Mon Sep 17 00:00:00 2001 +From: Matt Fleming +Date: Fri, 21 Jun 2013 07:13:16 +0000 +Subject: efi: Export __bcopyxx_len + +We need to provide a __bcopyxx_len symbol for EFI because it's +referenced in generic code in libcom32.c32. Without this change, +libcom32.c32 will fail to load under EFI. + +Signed-off-by: Matt Fleming +--- +diff --git a/core/include/core.h b/core/include/core.h +index 5736d39..127ac65 100644 +--- a/core/include/core.h ++++ b/core/include/core.h +@@ -26,6 +26,7 @@ extern char cmd_line[]; + extern char ConfigFile[]; + extern char syslinux_banner[]; + extern char copyright_str[]; ++extern unsigned int __bcopyxx_len; + + /* + * Mark symbols that are only used by BIOS as __weak until we can move +@@ -35,7 +36,6 @@ extern char copyright_str[]; + extern __weak uint16_t BIOSName; + extern __weak char KernelName[]; + extern __weak char StackBuf[]; +-extern __weak unsigned int __bcopyxx_len; + + extern uint8_t KbdMap[256]; + +diff --git a/efi/main.c b/efi/main.c +index 438e88c..51ff9f3 100644 +--- a/efi/main.c ++++ b/efi/main.c +@@ -153,6 +153,7 @@ void pxenv(void) + uint16_t BIOS_fbm = 1; + far_ptr_t InitStack; + far_ptr_t PXEEntry; ++__export unsigned int __bcopyxx_len = 0; + + void gpxe_unload(void) + { +-- +cgit v0.9.2 diff --git a/libre/syslinux/syslinux-6.02-fix-chainloading.patch b/libre/syslinux/syslinux-6.02-fix-chainloading.patch new file mode 100644 index 000000000..6fd7ef4a8 --- /dev/null +++ b/libre/syslinux/syslinux-6.02-fix-chainloading.patch @@ -0,0 +1,47 @@ +Reported-by: Dark Raven +Signed-off-by: Raphael S. Carvalho +--- + com32/lib/syslinux/disk.c | 22 ++++++++++++++-------- + 1 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/com32/lib/syslinux/disk.c b/com32/lib/syslinux/disk.c +index 0b0c737..47ecb52 100644 +--- a/com32/lib/syslinux/disk.c ++++ b/com32/lib/syslinux/disk.c +@@ -171,22 +171,28 @@ out: + static void *ebios_setup(const struct disk_info *const diskinfo, com32sys_t *inreg, + uint64_t lba, uint8_t count, uint8_t op_code) + { +- static __lowmem struct disk_ebios_dapa dapa; ++ static struct disk_ebios_dapa *dapa = NULL; + void *buf; + ++ if (!dapa) { ++ dapa = lmalloc(sizeof *dapa); ++ if (!dapa) ++ return NULL; ++ } ++ + buf = lmalloc(count * diskinfo->bps); + if (!buf) + return NULL; + +- dapa.len = sizeof(dapa); +- dapa.count = count; +- dapa.off = OFFS(buf); +- dapa.seg = SEG(buf); +- dapa.lba = lba; ++ dapa->len = sizeof(*dapa); ++ dapa->count = count; ++ dapa->off = OFFS(buf); ++ dapa->seg = SEG(buf); ++ dapa->lba = lba; + + inreg->eax.b[1] = op_code; +- inreg->esi.w[0] = OFFS(&dapa); +- inreg->ds = SEG(&dapa); ++ inreg->esi.w[0] = OFFS(dapa); ++ inreg->ds = SEG(dapa); + inreg->edx.b[0] = diskinfo->disk; + + return buf; diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch index 2b86ab828..54151ab87 100644 --- a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch +++ b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch @@ -4,9 +4,9 @@ diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile @@ -54,7 +54,7 @@ # files that depend only on the B phase, but may have to be regenerated # for "make installer". - BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ -- diag libinstaller dos win32 win64 dosutil -+ libinstaller + BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \ +- diag libinstaller dos win32 win64 dosutil txt ++ libinstaller txt ITARGET = IOBJECTS = $(ITARGET) \ utils/gethostip utils/isohybrid utils/mkdiskimage \ diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update index 34fe8e916..4dc09696a 100644 --- a/libre/syslinux/syslinux-install_update +++ b/libre/syslinux/syslinux-install_update @@ -1,7 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash # -# Sylinux Installer / Updater Scripts -# Copyright (C) 2011 Matthew Gyurgyik +# Syslinux Installer / Updater Script (for BIOS only) +# Copyright (C) 2013 Matthew Gyurgyik # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -26,13 +26,13 @@ # shopt -s nullglob -libpath="/usr/lib/syslinux" -bootpath="/boot/syslinux" -extlinux="/usr/bin/extlinux" +bios_libpath="/usr/lib/syslinux/bios/" +bios_bootpath="/boot/syslinux/" +EXTLINUX="/usr/bin/extlinux" -autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE -com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com) -pciids_file=/usr/share/hwdata/pci.ids +bios_core_modules=(config.c32 chain.c32 ldlinux.c32 libcom32.c32 libgpl.c32 liblua.c32 libmenu.c32 libutil.c32 linux.c32 menu.c32 vesamenu.c32) +bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE" +pciids_file="/usr/share/hwdata/pci.ids" ## Helper functions ## # Taken from libui-sh @@ -120,7 +120,7 @@ usage() { cat << EOF usage: $0 options -This script will install or upgrade Syslinux +This script will install or upgrade Syslinux (for BIOS only) OPTIONS: -h Show this message @@ -133,16 +133,16 @@ OPTIONS: Arguments Required: -c Chroot install (ex: -c /mnt) -Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr) - syslinux-install_update.sh -u (update) +Example Usage: $0 -i -a -m # (install, set boot flag, install mbr) + $0 -u # (update) EOF } # Trys to find the partition that /boot resides on # This will either be on /boot or / (root) getBoot() { - if [[ ! -d "$bootpath" ]]; then - echo "Could not find $bootpath" + if [[ ! -d "$bios_bootpath" ]]; then + echo "Could not find $bios_bootpath" echo "Is boot mounted? Is Syslinux installed?" exit 1 fi @@ -278,9 +278,9 @@ install_mbr() { { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} if [[ "$ptb" = MBR ]]; then - mbrfile="$libpath/mbr.bin" + mbrfile="$bios_libpath/mbr.bin" elif [[ "$ptb" = GPT ]]; then - mbrfile="$libpath/gptmbr.bin" + mbrfile="$bios_libpath/gptmbr.bin" fi if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then @@ -293,67 +293,65 @@ install_mbr() { return 0 } -_install() { - # Copy files to /boot - for file in "${com32_files[@]}"; do - # Symlink files even if links exist +install_modules() { + # Copy all com32 files to /boot + for file in "${bios_libpath}"/*.c32; do + file=${file##*/} + rm "$bios_bootpath/$file" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + # Symlink files if /boot resides on the same partition as root + ln -sf "${bios_libpath#$CHROOT}/$file" "$bios_bootpath/$file" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$libpath/$file" "$bootpath/$file" + cp "$bios_libpath/$file" "$bios_bootpath/$file" fi done - # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS - if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then + # Copy / Symlink pci.ids if pci.ids exists on the FS + if [[ -f $pciids_file ]]; then + rm "$bios_bootpath/pci.ids" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null + ln -sf "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null fi fi +} + +_install() { + install_modules if device_is_raid "$bootpart"; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 + echo "Detected RAID on /boot" + "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --install "$bootpath" > /dev/null 2>&1 + "$EXTLINUX" --install "$bios_bootpath" &> /dev/null fi if (( $? )); then - echo "Syslinux install failed" + echo "Syslinux BIOS install failed" exit 2 else - echo "Syslinux install successful" + echo "Syslinux BIOS install successful" fi - touch "$CHROOT/$autoupdate_file" + touch "$CHROOT/$bios_autoupdate_file" } update() { - # Update any com and c32 files in /boot - if [[ "$boot" = boot ]]; then - for file in "$bootpath"/*.{c32,com}; do - file=$(basename "$file") - cp "$libpath/$file" "$bootpath/$file" &> /dev/null - done - if [[ -f "$bootpath/pci.ids" ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null - fi - fi + install_modules if device_is_raid $bootpart; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --update "$bootpath" -r &> /dev/null + echo "Detected RAID on /boot" + "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --update "$bootpath" &> /dev/null + "$EXTLINUX" --update "$bios_bootpath" &> /dev/null fi if (($?)); then - echo "Syslinux update failed" + echo "Syslinux BIOS update failed" exit 2 else - echo "Syslinux update successful" + echo "Syslinux BIOS update successful" fi } @@ -388,7 +386,7 @@ while getopts "c:uihmas" opt; do ;; s) # If AUTOUPDATE_FILE does not exist exit the script - if [[ -f $autoupdate_file ]]; then + if [[ -f $bios_autoupdate_file ]]; then UPDATE="True" else exit 0 @@ -420,14 +418,14 @@ fi # If a chroot dir is path set variables to reflect chroot if [[ "$CHROOT" ]]; then - libpath="$CHROOT$libpath" - bootpath="$CHROOT$bootpath" - extlinux="$CHROOT$extlinux" + bios_libpath="$CHROOT$bios_libpath" + bios_bootpath="$CHROOT$bios_bootpath" + EXTLINUX="$CHROOT$EXTLINUX" fi # Exit if no /boot path exists -if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then - echo "Error: $bootpath is empty!" +if ( f=("$bios_bootpath"/*); (( ! ${#f[@]} )) ); then + echo "Error: $bios_bootpath is empty!" echo "Is /boot mounted?" exit 1 fi diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg index e7199438f..0c0c6339a 100644 --- a/libre/syslinux/syslinux.cfg +++ b/libre/syslinux/syslinux.cfg @@ -7,7 +7,6 @@ # * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders # * hdt.c32 - hardware detection tool # * reboot.c32 - reboots the system -# * poweroff.com - shutdown the system # # To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux. # If /usr and /boot are on the same file system, symlink the files instead @@ -50,21 +49,21 @@ MENU COLOR tabmsg 35;40 #ff777caa #00000000 std #-* LABEL parabola - MENU LABEL Parabola GNU/Linux-libre - LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 rw - INITRD ../initramfs-linux-libre.img + MENU LABEL Parabola GNU/Linux-libre + LINUX ../vmlinuz-linux-libre + APPEND root=/dev/sda3 rw + INITRD ../initramfs-linux-libre.img LABEL parabolafallback - MENU LABEL Parabola GNU/Linux-libre Fallback - LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 rw - INITRD ../initramfs-linux-libre-fallback.img + MENU LABEL Parabola GNU/Linux-libre Fallback + LINUX ../vmlinuz-linux-libre + APPEND root=/dev/sda3 rw + INITRD ../initramfs-linux-libre-fallback.img # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) -# LABEL memtest -# MENU LABEL Memtest86+ -# LINUX ../memtest86+/memtest.bin +# LABEL memtest +# MENU LABEL Memtest86+ +# LINUX ../memtest86+/memtest.bin LABEL hdt MENU LABEL HDT (Hardware Detection Tool) @@ -73,7 +72,7 @@ LABEL hdt LABEL reboot MENU LABEL Reboot COM32 reboot.c32 - -LABEL off - MENU LABEL Power Off - COMBOOT poweroff.com + +LABEL poweroff + MENU LABEL Poweroff + COM32 poweroff.c32 diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install index 89dbf4e86..ac8553a97 100644 --- a/libre/syslinux/syslinux.install +++ b/libre/syslinux/syslinux.install @@ -1,13 +1,36 @@ post_install() { - echo "==> If you want to use syslinux as your bootloader" + echo "==> If you want to use syslinux as your BIOS bootloader" echo "==> edit /boot/syslinux/syslinux.cfg and run" echo "==> # /usr/bin/syslinux-install_update -i -a -m" echo "==> to install it." + + cat << EOF +Syslinux efi64 and efi32 files have been installed at +/usr/lib/syslinux/{efi64,efi32}/ respectively. + +To install, copy /usr/lib/syslinux/efi64 to (ESP)/EFI/syslinux and +syslinux.cfg to (ESP)/EFI/syslinux/syslinux.cfg and add a boot entry +using efibootmgr for (ESP)/EFI/syslinux/syslinux.efi +EOF + } post_upgrade() { # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists /usr/bin/syslinux-install_update -s + # update to 5.01 message + if [ "$(vercmp $2 5.01)" -lt 0 ]; then + echo "If you used syslinux-install_update to install syslinux:" + echo "==> If you want to use syslinux with menu and all modules please rerun" + echo "==> # /usr/bin/syslinux-install_update -i -a -m" + echo "" + echo "If you manually installed syslinux:" + echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory." + echo "==> If (/ and /boot on seperate fs):" + echo "==> # cp /usr/lib/syslinux/bios/*.c32 /boot/syslinux" + echo "==> If (/ and /boot on same fs):" + echo "==> # ln -s /usr/lib/syslinux/bios/*.c32 /boot/syslinux" + fi } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf