diff options
Diffstat (limited to 'libre/syslinux')
| -rw-r--r-- | libre/syslinux/PKGBUILD | 14 | ||||
| -rw-r--r-- | libre/syslinux/syslinux-install_update | 57 | ||||
| -rw-r--r-- | libre/syslinux/syslinux.install | 2 |
3 files changed, 32 insertions, 41 deletions
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index 35a17b630..ad30022df 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -5,7 +5,7 @@ pkgname="syslinux" pkgver="6.02" -pkgrel="3" +pkgrel="4" 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/" @@ -22,19 +22,17 @@ optdepends=('perl-passwd-md5: For md5pass' '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') +md5sums=('6f275813a1b08cf852e55c0a3f8fbc78' + 'f048880b57e2c5a7017ff8804bfda327' + '9da2b8b25ea8d628887f11749dc3fffa' + '9dbede6b71a4de9e46aac4aad65334d7' + 'cb46ca47c6b6323127d908440057d98f') _build_syslinux_bios() { diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update index 4dc09696a..251b9c482 100644 --- a/libre/syslinux/syslinux-install_update +++ b/libre/syslinux/syslinux-install_update @@ -1,7 +1,8 @@ #!/usr/bin/env bash # # Syslinux Installer / Updater Script (for BIOS only) -# Copyright (C) 2013 Matthew Gyurgyik <pyther@pyther.net> +# Copyright (C) 2011-2013 Matthew Gyurgyik <pyther@pyther.net> +# Copyright (C) 2013 Keshav Padram Amburay <(the) (ddoott) (ridikulus) (ddoott) (rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,19 +19,23 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # #----------------- +# ChangeLog: +# 2013-10-23 : Keshav Padram Amburay : Updated script to work with Syslinux 6.02 Parabola GNU/Linux-libre pkg +# 2013-10-30 : André Silva : Rebranded script for Parabola +#----------------- # Exit Codes: # 1 - get_boot_device or other function failed # 2 - install/update failed # 3 - set_active failed # 4 - install_mbr failed -# +#----------------- + shopt -s nullglob -bios_libpath="/usr/lib/syslinux/bios/" -bios_bootpath="/boot/syslinux/" +bios_libpath="/usr/lib/syslinux/bios" +bios_bootpath="/boot/syslinux" EXTLINUX="/usr/bin/extlinux" -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" @@ -294,34 +299,22 @@ install_mbr() { } 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 - # 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 "$bios_libpath/$file" "$bios_bootpath/$file" - fi - done + # Copy all syslinux *.c32 modules to /boot + rm "$bios_bootpath"/*.c32 &> /dev/null + cp "$bios_libpath"/*.c32 "$bios_bootpath"/ &> /dev/null # Copy / Symlink pci.ids if pci.ids exists on the FS - if [[ -f $pciids_file ]]; then + if [[ -f "$pciids_file" ]]; then rm "$bios_bootpath/pci.ids" &> /dev/null - if [[ "$boot" = root ]]; then - ln -sf "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null - elif [[ "$boot" = boot ]]; then - cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null - fi + cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null fi } _install() { install_modules - if device_is_raid "$bootpart"; then - echo "Detected RAID on /boot" + if device_is_raid "$bootpart" ; then + echo "Detected RAID on /boot - installing Syslinux with --raid" "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null else "$EXTLINUX" --install "$bios_bootpath" &> /dev/null @@ -340,8 +333,8 @@ _install() { update() { install_modules - if device_is_raid $bootpart; then - echo "Detected RAID on /boot" + if device_is_raid "$bootpart" ; then + echo "Detected RAID on /boot - installing Syslinux with --raid" "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null else "$EXTLINUX" --update "$bios_bootpath" &> /dev/null @@ -404,18 +397,18 @@ if [[ $USAGE ]]; then exit 0 fi -# Make sure only root can run our script -if (( $(id -u) != 0 )); then - echo "This script must be run as root" 1>&2 - exit 1 -fi - # Display Usage Information if both Install and Update are passed if [[ $INSTALL && $UPDATE ]]; then usage exit 1 fi +# Make sure only root can run our script +if (( $(id -u) != 0 )); then + echo "This script must be run as root" 1>&2 + exit 1 +fi + # If a chroot dir is path set variables to reflect chroot if [[ "$CHROOT" ]]; then bios_libpath="$CHROOT$bios_libpath" diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install index ac8553a97..7dc7a43c1 100644 --- a/libre/syslinux/syslinux.install +++ b/libre/syslinux/syslinux.install @@ -26,7 +26,7 @@ post_upgrade() { 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 "==> If (/ and /boot on separate 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" |