summaryrefslogtreecommitdiff
path: root/libre-testing
diff options
context:
space:
mode:
Diffstat (limited to 'libre-testing')
-rw-r--r--libre-testing/syslinux/PKGBUILD11
-rw-r--r--libre-testing/syslinux/splash.pngbin11984 -> 11947 bytes
-rw-r--r--libre-testing/syslinux/splash.xcfbin0 -> 30757 bytes
-rw-r--r--libre-testing/syslinux/syslinux-install_update108
-rw-r--r--libre-testing/syslinux/syslinux.cfg22
5 files changed, 63 insertions, 78 deletions
diff --git a/libre-testing/syslinux/PKGBUILD b/libre-testing/syslinux/PKGBUILD
index cdc3483d5..6e2264257 100644
--- a/libre-testing/syslinux/PKGBUILD
+++ b/libre-testing/syslinux/PKGBUILD
@@ -5,7 +5,7 @@
pkgname="syslinux"
pkgver="6.01"
-pkgrel="2"
+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,6 +22,10 @@ optdepends=('perl-passwd-md5: For md5pass'
'util-linux: For isohybrid'
'efibootmgr: For EFI support'
'dosfstools: For EFI support')
+md5sums=('5fe8959b92255143a334167ca1c395a6'
+ '2466fa3fe8c2577acb2a7025d7096c91'
+ '0e7d47e1f791f0c5e7bd40ed5c6d80cc'
+ 'cb46ca47c6b6323127d908440057d98f')
install="${pkgname}.install"
@@ -30,11 +34,6 @@ source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgve
'syslinux-install_update'
'splash.png')
-sha1sums=('d7bc1b188677f77ac2d7060d25491dc29877a9c4'
- 'a0238479aa2ed0bbd91d879d35bf7fce2600830f'
- 'b1d915045fe3094f5359df043c53e73a4dc32745'
- '1be7066848f2d58d67c63436294de5322ca34318')
-
_build_syslinux_bios() {
rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true
diff --git a/libre-testing/syslinux/splash.png b/libre-testing/syslinux/splash.png
index f94067681..eac14536b 100644
--- a/libre-testing/syslinux/splash.png
+++ b/libre-testing/syslinux/splash.png
Binary files differ
diff --git a/libre-testing/syslinux/splash.xcf b/libre-testing/syslinux/splash.xcf
new file mode 100644
index 000000000..c27d04445
--- /dev/null
+++ b/libre-testing/syslinux/splash.xcf
Binary files differ
diff --git a/libre-testing/syslinux/syslinux-install_update b/libre-testing/syslinux/syslinux-install_update
index c32ccf18a..4dc09696a 100644
--- a/libre-testing/syslinux/syslinux-install_update
+++ b/libre-testing/syslinux/syslinux-install_update
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
-# Sylinux Installer / Updater Scripts
-# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net>
+# Syslinux Installer / Updater Script (for BIOS only)
+# Copyright (C) 2013 Matthew Gyurgyik <pyther@pyther.net>
#
# 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/bios"
-bootpath="/boot/syslinux"
-extlinux="/usr/bin/extlinux"
+bios_libpath="/usr/lib/syslinux/bios/"
+bios_bootpath="/boot/syslinux/"
+EXTLINUX="/usr/bin/extlinux"
-core_modules=(ldlinux.c32)
-autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
-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,79 +293,65 @@ install_mbr() {
return 0
}
-_install() {
+install_modules() {
# Copy all com32 files to /boot
- for file in "${libpath}"/*.c32; do
+ for file in "${bios_libpath}"/*.c32; do
file=${file##*/}
- # Symlink files if /boot resides on the same partition as root
+ 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 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 c32 files in /boot, if /boot is not on same fs
- if [[ "$boot" = boot ]]; then
- for file in "$bootpath"/*.c32; do
- file=${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
-
- # Ensure core modules exist and if not install them
- for file in "${core_modules[@]}"; do
- if [[ ! -f $bootpath/$file ]]; then
- if [[ "$boot" = root ]]; then
- ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
- elif [[ "$boot" = boot ]]; then
- cp "$libpath/$file" "$bootpath/$file"
- fi
- fi
- done
+ 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
}
@@ -400,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
@@ -432,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-testing/syslinux/syslinux.cfg b/libre-testing/syslinux/syslinux.cfg
index 64d6596e3..f88c1a5fe 100644
--- a/libre-testing/syslinux/syslinux.cfg
+++ b/libre-testing/syslinux/syslinux.cfg
@@ -32,15 +32,15 @@ UI vesamenu.c32
# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu
MENU TITLE Parabola GNU/Linux-libre
MENU BACKGROUND splash.png
-MENU COLOR border 30;44 #40ffffff #a0000000 std
-MENU COLOR title 1;36;44 #9033ccff #a0000000 std
-MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all
-MENU COLOR unsel 37;44 #50ffffff #a0000000 std
-MENU COLOR help 37;40 #c0ffffff #a0000000 std
-MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std
-MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std
-MENU COLOR msg07 37;40 #90ffffff #a0000000 std
-MENU COLOR tabmsg 31;40 #30ffffff #00000000 std
+MENU COLOR border 35;40 #ff777caa #a0000000 std
+MENU COLOR title 1;35;40 #ff777caa #a0000000 std
+MENU COLOR sel 7;35;47 #e0ffffff #20777caa all
+MENU COLOR unsel 35;40 #ff777caa #a0000000 std
+MENU COLOR help 35;40 #ff777caa #a0000000 std
+MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std
+MENU COLOR timeout 1;35;40 #ff777caa #00000000 std
+MENU COLOR msg07 35;40 #ff777caa #a0000000 std
+MENU COLOR tabmsg 35;40 #ff777caa #00000000 std
# boot sections follow
#
@@ -51,13 +51,13 @@ MENU COLOR tabmsg 31;40 #30ffffff #00000000 std
LABEL parabola
MENU LABEL Parabola GNU/Linux-libre
LINUX ../vmlinuz-linux-libre
- APPEND root=/dev/sda3 ro
+ 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 ro
+ 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)