From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 27 Dec 2008 23:35:45 +0000 (+0100)
Subject: Moved hal to pyfire.
X-Git-Tag: v3.0-alpha1~301^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d207aa3595f25c0269b16f1e75aa5cb2dd606522;p=ipfire-3.x.git

Moved hal to pyfire.
---

diff --git a/src/pomona/instdata.py b/src/pomona/instdata.py
index 268a6165a..9301b6e35 100644
--- a/src/pomona/instdata.py
+++ b/src/pomona/instdata.py
@@ -60,7 +60,7 @@ class InstallData:
     def write(self, pomona):
         self.instLanguage.write(pomona.rootPath)
         self.keyboard.write(pomona.rootPath)
-        #self.timezone.write(pomona.rootPath)
+        self.timezone.write(pomona.rootPath)
         self.network.write(pomona.rootPath)
 
         self.users = users.Users()
diff --git a/src/pomona/network.py b/src/pomona/network.py
index 1ea44fd90..8b939f2a0 100644
--- a/src/pomona/network.py
+++ b/src/pomona/network.py
@@ -8,9 +8,7 @@ import socket
 import struct
 import os
 import time
-import minihal
-import pyfire
-import dbus
+import pyfire.hal
 from flags import flags
 
 from constants import *
@@ -98,7 +96,7 @@ class Network:
         return self.netdevices[device]
 
     def available(self):
-        for device in minihal.get_devices_by_type("net"):
+        for device in pyfire.hal.get_devices_by_type("net"):
             if device.has_key('net.arp_proto_hw_id'):
                 if device['net.arp_proto_hw_id'] == 1:
                     dev = device['device']
diff --git a/src/pomona/pomona b/src/pomona/pomona
index 53ea06e96..c03628343 100644
--- a/src/pomona/pomona
+++ b/src/pomona/pomona
@@ -26,7 +26,6 @@
 ###############################################################################
 
 echo "Running the Pomona Text Installer..."
-sleep 3
 
 python /usr/lib/pomona/installer.py $@
 
diff --git a/src/pyfire/__init__.py b/src/pyfire/__init__.py
index 9da73b682..30a6bc4f3 100644
--- a/src/pyfire/__init__.py
+++ b/src/pyfire/__init__.py
@@ -18,6 +18,8 @@
 #                                                                             #
 ###############################################################################
 
+__all__ = [ "config", "executil", "hal", "net", "translate", "web", ]
+
 # A dummy
 def pyfire():
     from pyfire.translate import _, textdomain
diff --git a/src/pomona/minihal.py b/src/pyfire/hal.py
similarity index 100%
rename from src/pomona/minihal.py
rename to src/pyfire/hal.py
diff --git a/src/rootfiles/core/pyfire b/src/rootfiles/core/pyfire
index 8820de561..0edd8dd89 100644
--- a/src/rootfiles/core/pyfire
+++ b/src/rootfiles/core/pyfire
@@ -1,19 +1,22 @@
 usr/lib/python2.6/site-packages/pyfire
 usr/lib/python2.6/site-packages/pyfire/__init__.py
-#usr/lib/python2.6/site-packages/pyfire/__init__.pyc
+usr/lib/python2.6/site-packages/pyfire/__init__.pyc
 usr/lib/python2.6/site-packages/pyfire/__init__.pyo
 usr/lib/python2.6/site-packages/pyfire/config.py
-#usr/lib/python2.6/site-packages/pyfire/config.pyc
+usr/lib/python2.6/site-packages/pyfire/config.pyc
 usr/lib/python2.6/site-packages/pyfire/config.pyo
 usr/lib/python2.6/site-packages/pyfire/executil.py
-#usr/lib/python2.6/site-packages/pyfire/executil.pyc
+usr/lib/python2.6/site-packages/pyfire/executil.pyc
 usr/lib/python2.6/site-packages/pyfire/executil.pyo
+usr/lib/python2.6/site-packages/pyfire/hal.py
+usr/lib/python2.6/site-packages/pyfire/hal.pyc
+usr/lib/python2.6/site-packages/pyfire/hal.pyo
 usr/lib/python2.6/site-packages/pyfire/net.py
-#usr/lib/python2.6/site-packages/pyfire/net.pyc
+usr/lib/python2.6/site-packages/pyfire/net.pyc
 usr/lib/python2.6/site-packages/pyfire/net.pyo
 usr/lib/python2.6/site-packages/pyfire/translate.py
-#usr/lib/python2.6/site-packages/pyfire/translate.pyc
+usr/lib/python2.6/site-packages/pyfire/translate.pyc
 usr/lib/python2.6/site-packages/pyfire/translate.pyo
 usr/lib/python2.6/site-packages/pyfire/web.py
-#usr/lib/python2.6/site-packages/pyfire/web.pyc
+usr/lib/python2.6/site-packages/pyfire/web.pyc
 usr/lib/python2.6/site-packages/pyfire/web.pyo