c22003e8e3
- Rename export-syslinux-lib-root.patch to syslinux-lib-root.patch and fix syslinux logic. OBS-URL: https://build.opensuse.org/request/show/883879 OBS-URL: https://build.opensuse.org/package/show/utilities/bootiso?expand=0&rev=4
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From: = Mustafa Çalışkan <musfay@protonmail.com>
|
||
Date: Mon, 1 Feb 2021 23:43:06 +0300
|
||
Subject: [PATCH] export syslinux lib root
|
||
|
||
---
|
||
bootiso | 2 ++
|
||
1 file changed, 2 insertions(+)
|
||
|
||
Index: bootiso-4.2.0/bootiso
|
||
===================================================================
|
||
--- bootiso-4.2.0.orig/bootiso
|
||
+++ bootiso-4.2.0/bootiso
|
||
@@ -23,6 +23,9 @@
|
||
# This file is organized in "pseudo-modules".
|
||
# Refer to the style.md file for a detailed definition.
|
||
|
||
+# SUSE default
|
||
+export BOOTISO_SYSLINUX_LIB_ROOT=${BOOTISO_SYSLINUX_LIB_ROOT:-/usr/share/syslinux}
|
||
+
|
||
set -o pipefail
|
||
set -E
|
||
|
||
@@ -1323,8 +1326,13 @@ function asrt_checkSyslinuxInstall() {
|
||
"Your distribution doesn't ship 'extlinux' with the 'syslinux' package." \
|
||
"Please install 'extlinux' and try again."
|
||
fi
|
||
- st_foundSyslinuxBiosFolder=$(find "$ct_syslinuxLibRoot" -type d -path '*/bios' -print -quit)
|
||
- st_foundSyslinuxMbrBinary=$(fs_findFileFromPatterns "$ct_syslinuxLibRoot" 'bios/mbr.bin' 'mbr.bin')
|
||
+
|
||
+ st_foundSyslinuxBiosFolder=""
|
||
+ st_foundSyslinuxMbrBinary=""
|
||
+
|
||
+ [ -f $ct_syslinuxLibRoot/isolinux.bin ] && st_foundSyslinuxBiosFolder=$ct_syslinuxLibRoot
|
||
+ [ -f $ct_syslinuxLibRoot/mbr.bin ] && st_foundSyslinuxMbrBinary="$ct_syslinuxLibRoot/mbr.bin"
|
||
+
|
||
if [ -z "$st_foundSyslinuxBiosFolder" ]; then
|
||
ps_failAndExit MISSING_DEPENDENCY \
|
||
"Could not find a SYSLINUX bios folder containing c32 bios module files on this system."
|