unetbootin/unetbootin-583-openmamba-2.patch

87 lines
4.3 KiB
Diff

diff -Nru unetbootin-583.orig/distrolst.cpp unetbootin-583/distrolst.cpp
--- unetbootin-583.orig/distrolst.cpp 2012-12-24 09:14:22.000000000 +0100
+++ unetbootin-583/distrolst.cpp 2013-02-03 14:37:53.338734805 +0100
@@ -762,6 +762,54 @@
kernelOpts = "rw vga=1 init=/linuxrc";
}
+if (nameDistro == "openmamba")
+{
+ if (isarch64)
+ {
+ cpuarch = "x86_64";
+ }
+ else
+ {
+ cpuarch = "i586";
+ }
+ QString milestone = nameVersion.section('_', 0,0);
+ QString repo = milestone;
+ if (milestone == "snapshot") {
+ repo = "devel";
+ }
+ QString part = nameVersion.section('_', 1,1);
+ QString lang = nameVersion.section('_', 2,2);
+ QString cpiotmpf = randtmpfile::getrandfilename(ubntmpf, "cpio");
+ QString cpiogztmpf = cpiotmpf + ".gz";
+ downloadfile(QString("http://www.openmamba.org/pub/openmamba/media/%1/%2/%3/openmamba-%2-%3-%4.%5.iso").arg(repo, part, lang, milestone, cpuarch), QString("%1openmamba-live.iso").arg(targetPath));
+ downloadfile(QString("http://www.openmamba.org/pub/openmamba/media/%1/bootusb/%2/openmamba-bootusb-%2-%3.%4.cpio.gz").arg(repo, lang, milestone, cpuarch), cpiogztmpf);
+ extractfile(QFileInfo(cpiotmpf).fileName(), cpiotmpf, cpiogztmpf);
+ callexternapp(sevzcommand, QString("-bd -aoa -o\"%1\" x \"%2\"").arg(QDir::toNativeSeparators(targetPath), QDir::toNativeSeparators(cpiotmpf)));
+#ifdef Q_OS_LINUX
+ isext2 = false;
+ if (!volidcommand.isEmpty())
+ {
+ if (callexternapp(volidcommand, QString("-t %2").arg(targetDev)).contains(QRegExp("(ext2|ext3|ext4)")))
+ isext2 = true;
+ }
+ else
+ {
+ QString tstrblk = callexternapp(blkidcommand, QString("-s TYPE %2").arg(targetDev));
+ if (tstrblk.contains('='))
+ {
+ if (tstrblk.contains(QRegExp("(ext2|ext3|ext4)")))
+ isext2 = true;
+ }
+ }
+#endif
+ if (isext2)
+ setLabel(targetDev, "openmamba_live");
+ else
+ // TODO: not ext2 installation is not supported yet
+ setLabel(targetDev, "OPENMAMBALV");
+ targetPath = targetPath + "/boot/";
+}
+
if (nameDistro == "openSUSE")
{
if (isarch64)
diff -Nru unetbootin-583.orig/distrover.cpp unetbootin-583/distrover.cpp
--- unetbootin-583.orig/distrover.cpp 2012-12-24 09:14:50.000000000 +0100
+++ unetbootin-583/distrover.cpp 2013-02-03 14:39:07.926980662 +0100
@@ -183,6 +183,24 @@
"<b>Description:</b> The Offline NT Password and Registry Editor can reset Windows passwords and edit the registry on Windows 2000-Vista.<br/>"
"<b>Install Notes:</b> NTPasswd is booted and run in live mode; no installation is required to use it.") <<
"2008.05.26" << "2011.05.11"));
+#ifdef Q_OS_LINUX
+distroselect->addItem("openmamba", (QStringList() << "livecd_en_milestone2" <<
+unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.openmamba.org/\">http://www.openmamba.org</a><br/>"
+ "<b>Description:</b> openmamba is a fully-featured desktop and server distribution.<br/>"
+ "milestone2 is the latest stable release. snapshot are less stable but include the most up-to-date software releases.<br/>"
+ "livecd or livedvd are the most supported media based on the KDE4 desktop environment, livecd-light is a light LXDE based environment while livecd-gnome runs GNOME desktop.<br/>"
+ "<b>Install Notes:</b> the USB device must be formatted with an ext2/3/4 filesystem") <<
+ "milestone2_livecd_en" << "milestone2_livecd_it" << "milestone2_livecd_es" <<
+ "milestone2_livedvd_en" << "milestone2_livedvd_it" << "milestone2_livedvd_es" <<
+ "milestone2_livecd-light_en" << "milestone2_livecd-light_it" << "milestone2_livecd-light_es" <<
+ "milestone2_livecd-gnome_en" << "milestone2_livecd-gnome_it" << "milestone2_livecd-gnome_es" <<
+ "snapshot_livecd_en" << "snapshot_livecd_it" << "snapshot_livecd_es" <<
+ "snapshot_livecd_en_x64" << "snapshot_livecd_it_x64" << "snapshot_livecd_es_x64" <<
+ "snapshot_livedvd_en" << "snapshot_livedvd_it" << "snapshot_livedvd_es" <<
+ "snapshot_livecd-light_en" << "snapshot_livecd-light_en_x64" << "snapshot_livecd-light_it" <<
+ "snapshot_livecd-light_it_x64" << "snapshot_livecd-light_es" << "snapshot_livecd-light_es_x64" <<
+ "snapshot_livecd-gnome_en" << "snapshot_livecd-gnome_it" << "snapshot_livecd-gnome_es"));
+#endif
distroselect->addItem("openSUSE", (QStringList() << "11.1" <<
unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.opensuse.org/\">http://www.opensuse.org</a><br/>"
"<b>Description:</b> openSUSE is a user-friendly Novell sponsored distribution.<br/>"