added NetbootCD and support for the new syslinux initrd optionn

unetbootin · Oct 2, 2011 · c9076f4 · c9076f4
1 parent c9cb938
commit c9076f4
Show file tree

Hide file tree

Showing 54 changed files with 3,390 additions and 2,852 deletions.
diff --git a/po/unetbootin.pot b/po/unetbootin.pot
diff --git a/src/unetbootin/distrolst.cpp b/src/unetbootin/distrolst.cpp
@@ -698,6 +698,12 @@ if (nameDistro == "MEPIS")
 	extractiso(isotmpf);
 }
 
+if (nameDistro == "NetbootCD")
+{
+	downloadfile("http://download.tuxfamily.org/netbootcd/NetbootCD-current.iso", isotmpf);
+	extractiso(isotmpf);
+}
+
 if (nameDistro == "NetBSD")
 {
 	if (isarch64)

diff --git a/src/unetbootin/distrover.cpp b/src/unetbootin/distrover.cpp
@@ -155,6 +155,11 @@ unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.mepis.org/\">http://www.me
 	"<b>Description:</b> MEPIS is a Debian-based distribution. SimplyMEPIS is a user-friendly version based on KDE, while AntiX is a lightweight version for older computers.<br/>"
 	"<b>Install Notes:</b> MEPIS supports booting in Live mode, from which the installer can optionally be launched.") <<
 	"SimplyMEPIS" << "SimplyMEPIS_x64" << "AntiX"));
+distroselect->addItem("NetbootCD", (QStringList() << "Latest" <<
+unetbootin::tr("<b>Homepage:</b> <a href=\"http://netbootcd.tuxfamily.org/\">http://netbootcd.tuxfamily.org</a><br/>"
+	"<b>Description:</b> NetbootCD is a small boot CD that downloads and boots network-based installers for other distributions.<br/>"
+	"<b>Install Notes:</b> NetbootCD boots and runs in live mode.") <<
+"Latest"));
 distroselect->addItem("NetBSD", (QStringList() << "4.0" <<
 unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.netbsd.org/\">http://www.netbsd.org</a><br/>"
 	"<b>Description:</b> NetBSD is a Unix-like operating system which focuses on portability.<br/>"

diff --git a/src/unetbootin/unetbootin.cpp b/src/unetbootin/unetbootin.cpp
@@ -989,7 +989,7 @@ bool unetbootin::checkifoutofspace(QString destindir)
 QString unetbootin::locatekernel(QString archivefile, QPair<QStringList, QList<quint64> > archivefileconts)
 {
 	pdesc1->setText(tr("Locating kernel file in %1").arg(archivefile));
-	QStringList kernelnames = QStringList() << "vmlinuz" << "vmlinux" << "bzImage" << "kernel" << "sabayon" << "gentoo" << "linux26" << "linux24" << "bsd" << "unix" << "linux" << "rescue" << "xpud";
+	QStringList kernelnames = QStringList() << "vmlinuz" << "vmlinux" << "bzImage" << "kernel" << "sabayon" << "gentoo" << "linux26" << "linux24" << "bsd" << "unix" << "linux" << "rescue" << "xpud" << "bzI" << "kexec";
 	QStringList tnarchivefileconts;
 	QStringList narchivefileconts;
 	QString curarcitm;
@@ -2186,6 +2186,13 @@ QPair<QPair<QStringList, QStringList>, QPair<QStringList, QStringList> > unetboo
 			kernelpassed = true;
 			continue;
 		}
+		if (cfgfileCL.contains(QRegExp("^initrd\\s{1,}\\S{1,}", Qt::CaseInsensitive)))
+		{
+			if (kernelandinitrd.second[curindex] == initrdLoc) {
+				kernelandinitrd.second[curindex] = getFirstTextBlock(QString(cfgfileCL).remove(QRegExp("^initrd", Qt::CaseInsensitive)).trimmed());
+			}
+			continue;
+		}
 	}
 	return qMakePair(kernelandinitrd, titleandparams);
 }

diff --git a/src/unetbootin/unetbootin.ts b/src/unetbootin/unetbootin.ts
diff --git a/src/unetbootin/unetbootin_am.ts b/src/unetbootin/unetbootin_am.ts
diff --git a/src/unetbootin/unetbootin_ar.ts b/src/unetbootin/unetbootin_ar.ts
diff --git a/src/unetbootin/unetbootin_ast.ts b/src/unetbootin/unetbootin_ast.ts
diff --git a/src/unetbootin/unetbootin_be.ts b/src/unetbootin/unetbootin_be.ts
diff --git a/src/unetbootin/unetbootin_bg.ts b/src/unetbootin/unetbootin_bg.ts
diff --git a/src/unetbootin/unetbootin_bn.ts b/src/unetbootin/unetbootin_bn.ts
diff --git a/src/unetbootin/unetbootin_ca.ts b/src/unetbootin/unetbootin_ca.ts
diff --git a/src/unetbootin/unetbootin_cs.ts b/src/unetbootin/unetbootin_cs.ts
diff --git a/src/unetbootin/unetbootin_da.ts b/src/unetbootin/unetbootin_da.ts
diff --git a/src/unetbootin/unetbootin_de.ts b/src/unetbootin/unetbootin_de.ts
diff --git a/src/unetbootin/unetbootin_el.ts b/src/unetbootin/unetbootin_el.ts
diff --git a/src/unetbootin/unetbootin_eo.ts b/src/unetbootin/unetbootin_eo.ts
diff --git a/src/unetbootin/unetbootin_es.ts b/src/unetbootin/unetbootin_es.ts
diff --git a/src/unetbootin/unetbootin_et.ts b/src/unetbootin/unetbootin_et.ts
diff --git a/src/unetbootin/unetbootin_eu.ts b/src/unetbootin/unetbootin_eu.ts
diff --git a/src/unetbootin/unetbootin_fi.ts b/src/unetbootin/unetbootin_fi.ts
diff --git a/src/unetbootin/unetbootin_fo.ts b/src/unetbootin/unetbootin_fo.ts
diff --git a/src/unetbootin/unetbootin_fr.ts b/src/unetbootin/unetbootin_fr.ts
diff --git a/src/unetbootin/unetbootin_gl.ts b/src/unetbootin/unetbootin_gl.ts
diff --git a/src/unetbootin/unetbootin_he.ts b/src/unetbootin/unetbootin_he.ts
diff --git a/src/unetbootin/unetbootin_hr.ts b/src/unetbootin/unetbootin_hr.ts
diff --git a/src/unetbootin/unetbootin_hu.ts b/src/unetbootin/unetbootin_hu.ts
diff --git a/src/unetbootin/unetbootin_id.ts b/src/unetbootin/unetbootin_id.ts
diff --git a/src/unetbootin/unetbootin_it.ts b/src/unetbootin/unetbootin_it.ts
diff --git a/src/unetbootin/unetbootin_ja.ts b/src/unetbootin/unetbootin_ja.ts
diff --git a/src/unetbootin/unetbootin_lt.ts b/src/unetbootin/unetbootin_lt.ts
diff --git a/src/unetbootin/unetbootin_lv.ts b/src/unetbootin/unetbootin_lv.ts
diff --git a/src/unetbootin/unetbootin_ml.ts b/src/unetbootin/unetbootin_ml.ts
diff --git a/src/unetbootin/unetbootin_ms.ts b/src/unetbootin/unetbootin_ms.ts
diff --git a/src/unetbootin/unetbootin_nan.ts b/src/unetbootin/unetbootin_nan.ts
diff --git a/src/unetbootin/unetbootin_nb.ts b/src/unetbootin/unetbootin_nb.ts
diff --git a/src/unetbootin/unetbootin_nl.ts b/src/unetbootin/unetbootin_nl.ts
diff --git a/src/unetbootin/unetbootin_nn.ts b/src/unetbootin/unetbootin_nn.ts
diff --git a/src/unetbootin/unetbootin_pl.ts b/src/unetbootin/unetbootin_pl.ts
diff --git a/src/unetbootin/unetbootin_pt.ts b/src/unetbootin/unetbootin_pt.ts
diff --git a/src/unetbootin/unetbootin_pt_BR.ts b/src/unetbootin/unetbootin_pt_BR.ts
diff --git a/src/unetbootin/unetbootin_ro.ts b/src/unetbootin/unetbootin_ro.ts
diff --git a/src/unetbootin/unetbootin_ru.ts b/src/unetbootin/unetbootin_ru.ts
diff --git a/src/unetbootin/unetbootin_sk.ts b/src/unetbootin/unetbootin_sk.ts
diff --git a/src/unetbootin/unetbootin_sl.ts b/src/unetbootin/unetbootin_sl.ts
diff --git a/src/unetbootin/unetbootin_sr.ts b/src/unetbootin/unetbootin_sr.ts
diff --git a/src/unetbootin/unetbootin_sv.ts b/src/unetbootin/unetbootin_sv.ts
diff --git a/src/unetbootin/unetbootin_sw.ts b/src/unetbootin/unetbootin_sw.ts
diff --git a/src/unetbootin/unetbootin_tr.ts b/src/unetbootin/unetbootin_tr.ts
diff --git a/src/unetbootin/unetbootin_uk.ts b/src/unetbootin/unetbootin_uk.ts
diff --git a/src/unetbootin/unetbootin_ur.ts b/src/unetbootin/unetbootin_ur.ts
diff --git a/src/unetbootin/unetbootin_vi.ts b/src/unetbootin/unetbootin_vi.ts
diff --git a/src/unetbootin/unetbootin_zh_CN.ts b/src/unetbootin/unetbootin_zh_CN.ts
diff --git a/src/unetbootin/unetbootin_zh_TW.ts b/src/unetbootin/unetbootin_zh_TW.ts