From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 22 May 2009 10:53:12 +0000 (+0200)
Subject: Some minor fixes on installer.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac64954c43332f1dbd88ec575594d7ea2f3c8dbb;p=ipfire-3.x.git

Some minor fixes on installer.
---

diff --git a/src/pomona/constants.py b/src/pomona/constants.py
index 5b625206e..c8ac4f98a 100644
--- a/src/pomona/constants.py
+++ b/src/pomona/constants.py
@@ -15,7 +15,7 @@ kernelVersion = "KVER"
 HARDDISK_PATH = "/mnt/target"
 SOURCE_PATH = "/mnt/source"
 INFO_FILE = ".%sinfo" % (sname,)
-IMAGE_FILE = "%s-%s.img" % (sname, version)
+IMAGE_FILE = "%s-%s.sfs" % (sname, version)
 IMAGE_FILE_LS = "%s-%s.ls" % (sname, version)
 
 REQUIRED_FILES = (IMAGE_FILE,)
diff --git a/src/pomona/pakfireinstall.py b/src/pomona/pakfireinstall.py
index 45aacdc09..ada57f038 100644
--- a/src/pomona/pakfireinstall.py
+++ b/src/pomona/pakfireinstall.py
@@ -115,11 +115,12 @@ class PomonaPakfire:
         filename    = os.path.join(SOURCE_PATH, IMAGE_FILE)
         filename_ls = os.path.join(SOURCE_PATH, IMAGE_FILE_LS)
 
-        fd = open(filename_ls, 'r')
-        filesize = 0
-        while fd.readline():
-            filesize += 1
-        fd.close()
+        # XXX Temporarily disabled
+        #fd = open(filename_ls, 'r')
+        filesize = 1000
+        #while fd.readline():
+        #    filesize += 1
+        #fd.close()
         cb.setSize(filesize)
 
         filesize = int(os.path.getsize(filename))
diff --git a/src/pomona/pomona b/src/pomona/pomona
index dbac021c3..b9b0bcb2a 100644
--- a/src/pomona/pomona
+++ b/src/pomona/pomona
@@ -49,4 +49,8 @@ for i in $@; do
 		break
 	fi
 done
+
+/etc/init.d/messagebus stop
+/etc/init.d/haldaemon stop
+
 reboot