From 1413b01974f156dc51c45a72256dc609cf4163f3 Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Tue, 29 Nov 2005 23:12:22 +0000
Subject: [PATCH] catch errors when unmounting

---
 data/skin.xml                     | 20 ++++++++++----------
 lib/python/Components/Harddisk.py |  6 ++++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/data/skin.xml b/data/skin.xml
index a5e8c6d5..af388807 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -170,17 +170,17 @@
 
 		<screen name="MoviePlayer" flags="wfNoBorder" position="0,370" size="720,148" title="InfoBar">
 			<ePixmap position="0,0" zPosition="-1" size="720,148" pixmap="/usr/share/enigma2/info-bg.png" />
-			<ePixmap position="200,60" zPosition="-1" size="433,57" pixmap="/usr/share/enigma2/dvr-buttons.png" />
+			<ePixmap position="200,60" zPosition="0" size="433,57" pixmap="/usr/share/enigma2/dvr-buttons.png" />
 			<!--<ePixmap position="0,0" zPosition="1" size="720,148" pixmap="/usr/share/enigma2/movieplayer.png" />
-
-			<ePixmap position="50,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/rewindbutton.png" />
-			<ePixmap position="95,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/playbutton.png" />
-			<ePixmap position="140,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/pausebutton.png" />
-			<ePixmap position="185,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/forwardbutton.png" />
-			<ePixmap position="230,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/stopbutton.png" />
-			<ePixmap position="275,40" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/recordbutton.png" />
-
-			<widget name="ServiceName" position="250,75" size="427,26" valign="center" font="Arial;22" backgroundColor="#101258" />
+-->
+<!--			<ePixmap position="230,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/rewindbutton.png" />
+			<ePixmap position="275,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/playbutton.png" />
+			<ePixmap position="320,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/pausebutton.png" />
+			<ePixmap position="365,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/forwardbutton.png" />
+			<ePixmap position="410,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/stopbutton.png" />
+			<ePixmap position="455,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/recordbutton.png" />
+-->
+<!--			<widget name="ServiceName" position="250,75" size="427,26" valign="center" font="Arial;22" backgroundColor="#101258" />
 			<widget name="CurrentTime" position="575,85" size="90,30" backgroundColor="dark" font="Arial;19" />
 			<eLabel position="70,0" size="300,30" text=".oO Movie Player Oo." font="Arial;20" />
 -->
diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 0fc17d69..09864fc9 100644
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -103,7 +103,8 @@ class Harddisk:
 
 	def unmount(self):
 		cmd = "/bin/umount " + self.devidex + "part*"
-		os.system(cmd)
+		res = os.system(cmd)
+		return (res >> 8)
 
 	def createPartition(self):
 		cmd = "/sbin/sfdisk -f " + self.devidex + "disc"
@@ -127,7 +128,8 @@ class Harddisk:
 		return (res >> 8)
 		
 	def initialize(self):
-		self.unmount()
+		if self.unmount() != 0:
+			return -5
 
 		if self.createPartition() != 0:
 			return -1
-- 
2.30.2