Hello community, here is the log from the commit of package unetbootin for openSUSE:Factory checked in at 2015-08-27 08:57:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unetbootin (Old) and /work/SRC/openSUSE:Factory/.unetbootin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unetbootin" Changes: -------- --- /work/SRC/openSUSE:Factory/unetbootin/unetbootin.changes 2015-01-20 12:38:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.unetbootin.new/unetbootin.changes 2015-08-27 08:57:12.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Aug 11 10:44:37 UTC 2015 - joerg.loren...@ki.tng.de + +- update to revision 613 +- removed source file unetbootin.desktop and added patch + unetbootin-desktop.patch to install original desktop file +- build with %optflags +- some clean ups in specfile + +------------------------------------------------------------------- Old: ---- unetbootin-source-608.tar.gz unetbootin.desktop New: ---- unetbootin-desktop.patch unetbootin-source-613.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unetbootin.spec ++++++ --- /var/tmp/diff_new_pack.WTjlb3/_old 2015-08-27 08:57:13.000000000 +0200 +++ /var/tmp/diff_new_pack.WTjlb3/_new 2015-08-27 08:57:13.000000000 +0200 @@ -16,7 +16,7 @@ # -%define rev 608 +%define rev 613 Name: unetbootin Summary: Universal Netboot Installer @@ -26,19 +26,20 @@ Release: 0 Url: https://sourceforge.net/projects/unetbootin/ Source: %{name}-source-%{rev}.tar.gz -Source1: %{name}.desktop Patch0: %{name}-suse.patch Patch1: %{name}-locate-usb-devices.diff +Patch2: %{name}-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: libqt4-devel +BuildRequires: hicolor-icon-theme Requires: mtools Requires: p7zip Requires: syslinux Requires: udev Requires: util-linux Requires: xdg-utils +Requires: hicolor-icon-theme %if 0%{?suse_version} == 1230 BuildRequires: libjpeg8-devel %endif @@ -53,32 +54,26 @@ %setup -q -c -n %{name} %patch0 -p1 %patch1 -p1 +%patch2 -p0 # rpmlint: wrong-file-end-of-line-encoding sed -i 's/\r$//' README.TXT %build lupdate unetbootin.pro lrelease unetbootin.pro -qmake "DEFINES += NOSTATIC" "RESOURCES -= unetbootin.qrc" +qmake QMAKE_CXXFLAGS="%optflags" "DEFINES += NOSTATIC" "RESOURCES -= unetbootin.qrc" make %{?_smp_mflags} %install -mkdir -p %{buildroot}%{_datadir}/pixmaps -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications - install -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name} install -d -m 0755 %{buildroot}%{_datadir}/%{name} install -D -m 0644 unetbootin_*.qm %{buildroot}%{_datadir}/%{name} -cp %{name}_64.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png - -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} - -%post -%desktop_database_post +for i in 16 22 24 32 48 64 128 192 256 ; do + install -D -m 0644 unetbootin_"$i".png %buildroot%{_datadir}/icons/hicolor/"$i"x"$i"/apps/%{name}.png; +done -%postun -%desktop_database_postun +install -D -m 0644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop %files %defattr(-,root,root) @@ -86,6 +81,6 @@ %{_sbindir}/* %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog ++++++ unetbootin-desktop.patch ++++++ --- unetbootin.desktop.orig 2014-04-05 08:33:20.000000000 +0200 +++ unetbootin.desktop 2015-08-10 10:13:50.725736800 +0200 @@ -1,12 +1,11 @@ [Desktop Entry] -Version=1.0 Name=UNetbootin +GenericName=UNetbootin Comment=Tool for creating Live USB drives -Categories=Application;System; -Exec=/usr/bin/unetbootin -Terminal=false Type=Application -Name[en_US]=UNetbootin -GenericName[en_US]=UNetbootin -Comment[en_US]=Tool for creating Live USB drives +Exec=/usr/bin/xdg-su -c /usr/sbin/unetbootin +Terminal=false Icon=unetbootin +Categories=System;Filesystem; +X-KDE-StartupNotify=true +X-SuSE-translate=true ++++++ unetbootin-source-608.tar.gz -> unetbootin-source-613.tar.gz ++++++ Files old/._INSTALL and new/._INSTALL differ Files old/._README.TXT and new/._README.TXT differ Files old/._build-nostatic and new/._build-nostatic differ Files old/._customdistrolst.cpp and new/._customdistrolst.cpp differ Files old/._customdistselect.cpp and new/._customdistselect.cpp differ Files old/._distrolst.cpp and new/._distrolst.cpp differ Files old/._distrover.cpp and new/._distrover.cpp differ Files old/._distrovercust.cpp and new/._distrovercust.cpp differ Files old/._main.cpp and new/._main.cpp differ Files old/._unetbootin.cpp and new/._unetbootin.cpp differ Files old/._unetbootin.desktop and new/._unetbootin.desktop differ Files old/._unetbootin.h and new/._unetbootin.h differ Files old/._unetbootin.pro and new/._unetbootin.pro differ Files old/._unetbootin.ts and new/._unetbootin.ts differ Files old/._unetbootin.ui and new/._unetbootin.ui differ Files old/._unetbootin_128.png and new/._unetbootin_128.png differ Files old/._unetbootin_14.png and new/._unetbootin_14.png differ Files old/._unetbootin_16.png and new/._unetbootin_16.png differ Files old/._unetbootin_192.png and new/._unetbootin_192.png differ Files old/._unetbootin_22.png and new/._unetbootin_22.png differ Files old/._unetbootin_24.png and new/._unetbootin_24.png differ Files old/._unetbootin_256.png and new/._unetbootin_256.png differ Files old/._unetbootin_32.png and new/._unetbootin_32.png differ Files old/._unetbootin_48.png and new/._unetbootin_48.png differ Files old/._unetbootin_512.png and new/._unetbootin_512.png differ Files old/._unetbootin_64.png and new/._unetbootin_64.png differ Files old/._unetbootin_am.ts and new/._unetbootin_am.ts differ Files old/._unetbootin_ar.ts and new/._unetbootin_ar.ts differ Files old/._unetbootin_ast.ts and new/._unetbootin_ast.ts differ Files old/._unetbootin_be.ts and new/._unetbootin_be.ts differ Files old/._unetbootin_bg.ts and new/._unetbootin_bg.ts differ Files old/._unetbootin_bn.ts and new/._unetbootin_bn.ts differ Files old/._unetbootin_ca.ts and new/._unetbootin_ca.ts differ Files old/._unetbootin_cs.ts and new/._unetbootin_cs.ts differ Files old/._unetbootin_custom.ts and new/._unetbootin_custom.ts differ Files old/._unetbootin_da.ts and new/._unetbootin_da.ts differ Files old/._unetbootin_de.ts and new/._unetbootin_de.ts differ Files old/._unetbootin_el.ts and new/._unetbootin_el.ts differ Files old/._unetbootin_eo.ts and new/._unetbootin_eo.ts differ Files old/._unetbootin_es.ts and new/._unetbootin_es.ts differ Files old/._unetbootin_et.ts and new/._unetbootin_et.ts differ Files old/._unetbootin_eu.ts and new/._unetbootin_eu.ts differ Files old/._unetbootin_fa.ts and new/._unetbootin_fa.ts differ Files old/._unetbootin_fi.ts and new/._unetbootin_fi.ts differ Files old/._unetbootin_fo.ts and new/._unetbootin_fo.ts differ Files old/._unetbootin_fr.ts and new/._unetbootin_fr.ts differ Files old/._unetbootin_gl.ts and new/._unetbootin_gl.ts differ Files old/._unetbootin_he.ts and new/._unetbootin_he.ts differ Files old/._unetbootin_hr.ts and new/._unetbootin_hr.ts differ Files old/._unetbootin_hu.ts and new/._unetbootin_hu.ts differ Files old/._unetbootin_icons.svg and new/._unetbootin_icons.svg differ Files old/._unetbootin_id.ts and new/._unetbootin_id.ts differ Files old/._unetbootin_it.ts and new/._unetbootin_it.ts differ Files old/._unetbootin_ja.ts and new/._unetbootin_ja.ts differ Files old/._unetbootin_lt.ts and new/._unetbootin_lt.ts differ Files old/._unetbootin_lv.ts and new/._unetbootin_lv.ts differ Files old/._unetbootin_ml.ts and new/._unetbootin_ml.ts differ Files old/._unetbootin_ms.ts and new/._unetbootin_ms.ts differ Files old/._unetbootin_nan.ts and new/._unetbootin_nan.ts differ Files old/._unetbootin_nb.ts and new/._unetbootin_nb.ts differ Files old/._unetbootin_nl.ts and new/._unetbootin_nl.ts differ Files old/._unetbootin_nn.ts and new/._unetbootin_nn.ts differ Files old/._unetbootin_pl.ts and new/._unetbootin_pl.ts differ Files old/._unetbootin_pt.ts and new/._unetbootin_pt.ts differ Files old/._unetbootin_pt_BR.ts and new/._unetbootin_pt_BR.ts differ Files old/._unetbootin_ro.ts and new/._unetbootin_ro.ts differ Files old/._unetbootin_ru.ts and new/._unetbootin_ru.ts differ Files old/._unetbootin_si.ts and new/._unetbootin_si.ts differ Files old/._unetbootin_sk.ts and new/._unetbootin_sk.ts differ Files old/._unetbootin_sl.ts and new/._unetbootin_sl.ts differ Files old/._unetbootin_sr.ts and new/._unetbootin_sr.ts differ Files old/._unetbootin_sv.ts and new/._unetbootin_sv.ts differ Files old/._unetbootin_sw.ts and new/._unetbootin_sw.ts differ Files old/._unetbootin_tr.ts and new/._unetbootin_tr.ts differ Files old/._unetbootin_uk.ts and new/._unetbootin_uk.ts differ Files old/._unetbootin_ur.ts and new/._unetbootin_ur.ts differ Files old/._unetbootin_vi.ts and new/._unetbootin_vi.ts differ Files old/._unetbootin_zh_CN.ts and new/._unetbootin_zh_CN.ts differ Files old/._unetbootin_zh_TW.ts and new/._unetbootin_zh_TW.ts differ Files old/._vcs-name and new/._vcs-name differ Files old/._vcs-revno and new/._vcs-revno differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.TXT new/README.TXT --- old/README.TXT 2014-06-02 05:37:20.000000000 +0200 +++ new/README.TXT 2015-07-20 10:43:12.000000000 +0200 @@ -1,16 +1,16 @@ -UNetbootin Source Revision 608 +UNetbootin Source Revision 613 Copyright Geza Kovacs Homepage at http://unetbootin.sourceforge.net Licensed under the GNU GPL v2 and above, components from other projects are licensed under their respective licenses -Build generated on Sun Jun 1 20:37:20 PDT 2014 +Build generated on Mon Jul 20 01:43:12 PDT 2015 Download using git: git clone https://github.com/gkovacs/unetbootin.git cd unetbootin -git checkout 8a89df4a0f507582d340053b4d3f64ad27518368 +git checkout cbf30e41bbd2ad57f31feb29c559d6a2046f0d6c Download using bzr: -bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r608 +bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r613 Build instructions at http://sourceforge.net/apps/trac/unetbootin/wiki/compile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distrolst.cpp new/distrolst.cpp --- old/distrolst.cpp 2014-04-21 08:30:26.000000000 +0200 +++ new/distrolst.cpp 2015-07-20 03:05:56.000000000 +0200 @@ -18,7 +18,10 @@ #ifndef ubunturelnamereplace #define ubunturelnamereplace \ relname \ - .replace("14.04", "trusty") \ + .replace("15.10", "wily") \ + .replace("15.04", "vivid") \ + .replace("14.10", "utopic") \ + .replace("14.04", "trusty") \ .replace("13.10", "saucy") \ .replace("13.04", "raring") \ .replace("12.10", "quantal") \ @@ -383,7 +386,14 @@ } if (islivecd) { - downloadfile(QString("http://download.fedoraproject.org/pub/fedora/linux/releases/%1/Live/%2/Fedora-Live-Desktop-%3-%1-1.iso";).arg(relname).arg(cpuarch).arg(minorarch), isotmpf); + downloadfile(fileFilterNetDir(QStringList() << + "http://download.fedoraproject.org/pub/fedora/linux/releases/"+relname+"/Live/"+cpuarch+"/"; + , 524288000, 2233125376, QList<QRegExp>() << + QRegExp(".iso$", Qt::CaseInsensitive) << + QRegExp("Fedora", Qt::CaseInsensitive) << + QRegExp("Live", Qt::CaseInsensitive) << + QRegExp("LXDE", Qt::CaseInsensitive) + ), isotmpf); extractiso(isotmpf); } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distrover.cpp new/distrover.cpp --- old/distrover.cpp 2014-06-01 22:49:45.000000000 +0200 +++ new/distrover.cpp 2015-07-20 02:57:22.000000000 +0200 @@ -10,10 +10,9 @@ #ifndef ubuntuverlist #define ubuntuverlist \ "12.04_NetInstall" << "12.04_NetInstall_x64" << "12.04_HdMedia" << "12.04_HdMedia_x64" << "12.04_Live" << "12.04_Live_x64" << \ -"12.10_NetInstall" << "12.10_NetInstall_x64" << "12.10_HdMedia" << "12.10_HdMedia_x64" << "12.10_Live" << "12.10_Live_x64" << \ -"13.04_NetInstall" << "13.04_NetInstall_x64" << "13.04_HdMedia" << "13.04_HdMedia_x64" << "13.04_Live" << "13.04_Live_x64" << \ -"13.10_NetInstall" << "13.10_NetInstall_x64" << "13.10_HdMedia" << "13.10_HdMedia_x64" << "13.10_Live" << "13.10_Live_x64" << \ "14.04_NetInstall" << "14.04_NetInstall_x64" << "14.04_HdMedia" << "14.04_HdMedia_x64" << "14.04_Live" << "14.04_Live_x64" << \ +"14.10_NetInstall" << "14.10_NetInstall_x64" << "14.10_HdMedia" << "14.10_HdMedia_x64" << "14.10_Live" << "14.10_Live_x64" << \ +"15.04_NetInstall" << "15.04_NetInstall_x64" << "15.04_HdMedia" << "15.04_HdMedia_x64" << "15.04_Live" << "15.04_Live_x64" << \ "Daily_Live" << "Daily_Live_x64" #endif @@ -68,11 +67,11 @@ "<b>Description:</b> Elive is a Debian-based distribution featuring the Enlightenment window manager.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched.") << "Stable_Live")); -distroselect->addItem("Fedora", (QStringList() << "20_Live" << +distroselect->addItem("Fedora", (QStringList() << "22_Live" << unetbootin::tr("<b>Homepage:</b> <a href=\"http://fedoraproject.org/\";>http://fedoraproject.org</a><br/>" "<b>Description:</b> Fedora is a Red Hat sponsored community distribution which showcases the latest cutting-edge free/open-source software.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for both installation over the internet (FTP), or offline installation using pre-downloaded installation ISO files.") << - "19_NetInstall" << "19_NetInstall_x64" << "19_Live" << "19_Live_x64" << "20_NetInstall" << "20_NetInstall_x64" << "20_Live" << "20_Live_x64" << "Rawhide_NetInstall" << "Rawhide_NetInstall_x64")); + "21_NetInstall" << "21_NetInstall_x64" << "21_Live" << "21_Live_x64" << "22_NetInstall" << "22_NetInstall_x64" << "22_Live" << "22_Live_x64" << "Rawhide_NetInstall" << "Rawhide_NetInstall_x64")); distroselect->addItem("FreeBSD", (QStringList() << "8.0" << unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.freebsd.org/\";>http://www.freebsd.org</a><br/>" "<b>Description:</b> FreeBSD is a general-purpose Unix-like operating system designed for scalability and performance.<br/>" @@ -136,11 +135,11 @@ "<b>Description:</b> LinuxConsole is a desktop distro to play games, easy to install, easy to use and fast to boot .<br/>" "<b>Install Notes:</b> The 1.0.2010 is latest 1.0, now available on rolling release (run liveuptate to update modules and kernel).") << "1.0.2010-cd")); - distroselect->addItem("Linux Mint", (QStringList() << "17_Live" << + distroselect->addItem("Linux Mint", (QStringList() << "17.2_Live" << unetbootin::tr("<b>Homepage:</b> <a href=\"http://linuxmint.com/\";>http://linuxmint.com</a><br/>" "<b>Description:</b> Linux Mint is a user-friendly Ubuntu-based distribution which includes additional proprietary codecs and other software by default.<br/>" "<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched.") << - "13_Live" << "13_Live_x64" << "14_Live" << "14_Live_x64" << "15_Live" << "15_Live_x64" << "16_Live" << "16_Live_x64" << "17_Live" << "17_Live_x64")); + "17_Live" << "17_Live_x64" << "17.1_Live" << "17.1_Live_x64" << "17.2_Live" << "17.2_Live_x64")); distroselect->addItem("Lubuntu", (QStringList() << "14.04_Live" << unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.lubuntu.net/\";>http://www.lubuntu.net</a><br/>" "<b>Description:</b> Lubuntu is an official Ubuntu derivative featuring the LXDE desktop.<br/>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unetbootin.cpp new/unetbootin.cpp --- old/unetbootin.cpp 2014-06-02 04:33:08.000000000 +0200 +++ new/unetbootin.cpp 2015-07-20 02:53:42.000000000 +0200 @@ -673,7 +673,11 @@ void unetbootin::on_FloppyFileSelector_clicked() { - QString nameFloppy = QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Disk Image File"), QDir::homePath(), tr("All Files") + " (*);;" + tr("ISO") + " (*.iso);;" + tr("Floppy") + " (*.img)")); + QString nameFloppy = QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Disk Image File"), QDir::homePath(), tr("All Files") + " (*);;" + tr("ISO") + " (*.iso);;" + tr("Floppy") + " (*.img)", 0 + #if (QT_VERSION >= QT_VERSION_CHECK(4, 5, 0)) + , QFileDialog::ReadOnly + #endif + )); if (QFileInfo(nameFloppy).completeSuffix().contains("iso", Qt::CaseInsensitive)) { if (diskimagetypeselect->findText(tr("ISO")) != -1) @@ -691,7 +695,11 @@ void unetbootin::on_KernelFileSelector_clicked() { - QString nameKernel = QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Kernel File"), QDir::homePath(), tr("All Files (*)"))); + QString nameKernel = QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Kernel File"), QDir::homePath(), tr("All Files (*)"), 0 + #if (QT_VERSION >= QT_VERSION_CHECK(4, 5, 0)) + , QFileDialog::ReadOnly + #endif + )); KernelPath->clear(); KernelPath->insert(nameKernel); radioManual->setChecked(true); @@ -699,7 +707,11 @@ void unetbootin::on_InitrdFileSelector_clicked() { - QString nameInitrd = QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Initrd File"), QDir::homePath(), tr("All Files (*)"))); + QString nameInitrd = QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Initrd File"), QDir::homePath(), tr("All Files (*)"), 0 + #if (QT_VERSION >= QT_VERSION_CHECK(4, 5, 0)) + , QFileDialog::ReadOnly + #endif + )); InitrdPath->clear(); InitrdPath->insert(nameInitrd); radioManual->setChecked(true); @@ -707,7 +719,11 @@ void unetbootin::on_CfgFileSelector_clicked() { - QString nameCfg = QFileDialog::getOpenFileName(this, tr("Open Bootloader Config File"), QDir::homePath(), tr("All Files (*)")); + QString nameCfg = QFileDialog::getOpenFileName(this, tr("Open Bootloader Config File"), QDir::homePath(), tr("All Files (*)"), 0 + #if (QT_VERSION >= QT_VERSION_CHECK(4, 5, 0)) + , QFileDialog::ReadOnly + #endif + ); OptionEnter->clear(); QString cfgoptstxt = getcfgkernargs(nameCfg, "", QStringList(), QStringList()); if (cfgoptstxt.isEmpty()) @@ -725,7 +741,7 @@ void unetbootin::on_okbutton_clicked() { - if (typeselect->currentIndex() == typeselect->findText(tr("USB Drive")) && driveselect->currentText().isEmpty()) + if (typeselect->currentIndex() == typeselect->findText(tr("USB Drive")) && driveselect->currentText().isEmpty() && !testingDownload) { QMessageBox unotenoughinputmsgb; unotenoughinputmsgb.setIcon(QMessageBox::Information); @@ -741,7 +757,7 @@ } } #ifdef Q_OS_MAC - if (locatemountpoint(driveselect->currentText()) == "NOT MOUNTED") + if (locatemountpoint(driveselect->currentText()) == "NOT MOUNTED" && !testingDownload) callexternapp("diskutil", "mount "+driveselect->currentText()); #endif #ifdef Q_OS_LINUX @@ -3376,13 +3392,29 @@ if (srcfName == "memdisk") 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"); + if (QFile::exists("/usr/lib/syslinux/modules/bios/menu.c32")) + srcF.setFileName("/usr/lib/syslinux/modules/bios/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"); + if (QFile::exists("/usr/lib/syslinux/modules/bios/libutil.c32")) + srcF.setFileName("/usr/lib/syslinux/modules/bios/libutil.c32"); + } else if (srcfName == "libcom32.c32") + { srcF.setFileName(QFile::exists("/usr/share/syslinux/libcom32.c32") ? "/usr/share/syslinux/libcom32.c32" : "/usr/lib/syslinux/libcom32.c32"); + if (QFile::exists("/usr/lib/syslinux/modules/bios/libcom32.c32")) + srcF.setFileName("/usr/lib/syslinux/modules/bios/libcom32.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"); + { + srcF.setFileName(QFile::exists("/usr/share/syslinux/mbr.bin") ? "/usr/share/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr.bin"); + if (QFile::exists("/usr/lib/syslinux/mbr/mbr.bin")) + srcF.setFileName("/usr/lib/syslinux/mbr/mbr.bin"); + } else if (srcfName == "ubnsylnx") srcF.setFileName("/usr/bin/syslinux"); // else @@ -4118,6 +4150,8 @@ QFile mbrbinF(":/mbr.bin"); #ifdef NOSTATIC mbrbinF.setFileName(QFile::exists("/usr/share/syslinux/mbr.bin") ? "/usr/share/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr.bin"); + if (QFile::exists("/usr/lib/syslinux/mbr/mbr.bin")) + mbrbinF.setFileName("/usr/lib/syslinux/mbr/mbr.bin"); #endif usbmbrF.open(QIODevice::WriteOnly); mbrbinF.open(QIODevice::ReadOnly);
