From: ghost <andreas.monzner@multimedia-labs.de>
Date: Mon, 13 Jul 2009 09:42:20 +0000 (+0200)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Tag: 2.6.0~205^2~6
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/6f3208500f3b07aaa3733b0b47f2e7a00426ed3e?hp=1f852a117325a59bd044a825fe302ecfc8e13f67

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

diff --git a/lib/base/encoding.cpp b/lib/base/encoding.cpp
index 6a997cf1..831de847 100644
--- a/lib/base/encoding.cpp
+++ b/lib/base/encoding.cpp
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <cstdlib>
 #include <lib/base/encoding.h>
 #include <lib/base/eerror.h>
diff --git a/lib/base/rawfile.cpp b/lib/base/rawfile.cpp
index e444ba90..d7f2a655 100644
--- a/lib/base/rawfile.cpp
+++ b/lib/base/rawfile.cpp
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <unistd.h>
 #include <fcntl.h>
 #include <lib/base/rawfile.h>
diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
index 6d404cf2..6292a46f 100644
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
@@ -494,7 +494,7 @@ class NFIDownload(Screen):
 			self.taskstring = ""
 			self.container.appClosed.append(self.fdisk_finished)
 			self.container.execute("fdisk " + self.stickdevice + "/disc")
-			self.container.write("d\nn\np\n1\n\n\nt\n6\nw\n")
+			self.container.write("d\n4\nd\n3\nd\n2\nd\nn\np\n1\n\n\nt\n6\nw\n")
 			self.delayTimer = eTimer()
 			self.delayTimer.callback.append(self.progress_increment)
 			self.delayTimer.start(105, False)