unetbootin/unetbootin-584-syslinux-5.patch

33 lines
1.8 KiB
Diff

diff -Nru unetbootin-584.orig/unetbootin.cpp unetbootin-584/unetbootin.cpp
--- unetbootin-584.orig/unetbootin.cpp 2013-07-01 21:16:52.363527422 +0200
+++ unetbootin-584/unetbootin.cpp 2013-07-01 21:24:07.128189373 +0200
@@ -3366,6 +3366,8 @@
srcF.setFileName(QFile::exists("/usr/share/syslinux/memdisk") ? "/usr/share/syslinux/memdisk" : "/usr/lib/syslinux/memdisk");
else if (srcfName == "menu.c32")
srcF.setFileName(QFile::exists("/usr/share/syslinux/menu.c32") ? "/usr/share/syslinux/menu.c32" : "/usr/lib/syslinux/menu.c32");
+ else if (srcfName == "libutil.c32")
+ srcF.setFileName(QFile::exists("/usr/share/syslinux/libutil.c32") ? "/usr/share/syslinux/libutil.c32" : "/usr/lib/syslinux/libutil.c32");
else if (srcfName == "mbr.bin")
srcF.setFileName(QFile::exists("/usr/share/syslinux/mbr.bin") ? "/usr/share/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr.bin");
else if (srcfName == "ubnsylnx")
@@ -4144,6 +4146,7 @@
if (!abssyslpathloc.startsWith("/"))
abssyslpathloc.prepend("/");
instIndvfl("menu.c32", QString("%1%2menu.c32").arg(targetPath).arg(syslpathloc));
+ instIndvfl("libutil.c32", QString("%1%2libutil.c32").arg(targetPath).arg(syslpathloc));
QString syslrealcfgloc = QString(locatedsyslinuxcfgfiles.at(j)).replace("isolinux.cfg", "syslinux.cfg").replace("extlinux.conf", "syslinux.cfg");
if (syslrealcfgloc != locatedsyslinuxcfgfiles.at(j))
{
@@ -4166,8 +4169,10 @@
if (!dontgeneratesyslinuxcfg && isext2)
QFile::copy(QString("%1syslinux.cfg").arg(targetPath), QString("%1extlinux.conf").arg(targetPath));
#endif
- if (!dontgeneratesyslinuxcfg)
+ if (!dontgeneratesyslinuxcfg) {
instIndvfl("menu.c32", QString("%1menu.c32").arg(targetPath));
+ instIndvfl("libutil.c32", QString("%1libutil.c32").arg(targetPath));
+ }
fininstall();
}