smolt/sme7/smolt-1.4.3-sme.patch

diff -ruN smolt-1.4.3.sme/client/config.py smolt-1.4.3/client/config.py
--- smolt-1.4.3.sme/client/config.py    2010-02-27 12:05:44.000000000 -0700
+++ smolt-1.4.3/client/config.py        2010-03-03 13:54:51.000000000 -0700
@@ -3,7 +3,7 @@
 import commands
 import os_detect
 
-SMOON_URL = "http://www.smolts.org/"
+SMOON_URL = "http://smolt.contribs.org/"
 SECURE = 0
 
 
diff -ruN smolt-1.4.3.sme/client/os_detect.py smolt-1.4.3/client/os_detect.py
--- smolt-1.4.3.sme/client/os_detect.py 2010-03-03 13:53:56.000000000 -0700
+++ smolt-1.4.3/client/os_detect.py     2010-03-03 13:54:51.000000000 -0700
@@ -55,6 +55,7 @@
 
 
 distro_info= odict()
+distro_info['SME Server']='/etc/e-smith-release'
 distro_info['Blag Linux']='/etc/blag-release'
 distro_info['MythVantage']='/etc/mythvantage-release'
 distro_info['Knoppmyth']='/etc/KnoppMyth-version'
diff -ruN smolt-1.4.3.sme/client/smolt.py smolt-1.4.3/client/smolt.py
--- smolt-1.4.3.sme/client/smolt.py     2010-03-03 13:53:56.000000000 -0700
+++ smolt-1.4.3/client/smolt.py 2010-03-03 13:55:27.000000000 -0700
@@ -60,7 +60,7 @@
 SELINUX_WITHHELD = -1
 
 fs_types = get_config_attr("FS_TYPES", ["ext2", "ext3", "xfs", "reiserfs"])
-fs_mounts = dict.fromkeys(get_config_attr("FS_MOUNTS", ["/", "/home", "/etc", "/var", "/boot"]), True)
+fs_mounts = dict.fromkeys(get_config_attr("FS_MOUNTS", ["/", "/home", "/home/e-smith/files", "/home/e-smith/files/ibays", "/home/e-smith/files/users", "/etc", "/var", "/boot", "/tmp"]), True)
 fs_m_filter = get_config_attr("FS_M_FILTER", False)
 fs_t_filter = get_config_attr("FS_T_FILTER", False)
 
@@ -457,6 +457,9 @@
             if Gate().grants('devices'):
                 self.devices[udi] = Device(props, self)
             if udi == '/org/freedesktop/Hal/devices/computer':
+                status, systemType = commands.getstatusoutput("/sbin/e-smith/config gettype SystemMode")
+                if status == 0:
+                    props['system.formfactor'] = systemType
                 try:
                     vendor = props['system.vendor']
                     if len(vendor.strip()) == 0:
1	slords	1.1	diff -ruN smolt-1.4.3.sme/client/config.py smolt-1.4.3/client/config.py
2			--- smolt-1.4.3.sme/client/config.py 2010-02-27 12:05:44.000000000 -0700
3			+++ smolt-1.4.3/client/config.py 2010-03-03 13:54:51.000000000 -0700
4			@@ -3,7 +3,7 @@
5			import commands
6			import os_detect
7
8			-SMOON_URL = "http://www.smolts.org/"
9			+SMOON_URL = "http://smolt.contribs.org/"
10			SECURE = 0
11
12
13			diff -ruN smolt-1.4.3.sme/client/os_detect.py smolt-1.4.3/client/os_detect.py
14			--- smolt-1.4.3.sme/client/os_detect.py 2010-03-03 13:53:56.000000000 -0700
15			+++ smolt-1.4.3/client/os_detect.py 2010-03-03 13:54:51.000000000 -0700
16			@@ -55,6 +55,7 @@
17
18
19			distro_info= odict()
20			+distro_info['SME Server']='/etc/e-smith-release'
21			distro_info['Blag Linux']='/etc/blag-release'
22			distro_info['MythVantage']='/etc/mythvantage-release'
23			distro_info['Knoppmyth']='/etc/KnoppMyth-version'
24			diff -ruN smolt-1.4.3.sme/client/smolt.py smolt-1.4.3/client/smolt.py
25			--- smolt-1.4.3.sme/client/smolt.py 2010-03-03 13:53:56.000000000 -0700
26			+++ smolt-1.4.3/client/smolt.py 2010-03-03 13:55:27.000000000 -0700
27			@@ -60,7 +60,7 @@
28			SELINUX_WITHHELD = -1
29
30			fs_types = get_config_attr("FS_TYPES", ["ext2", "ext3", "xfs", "reiserfs"])
31			-fs_mounts = dict.fromkeys(get_config_attr("FS_MOUNTS", ["/", "/home", "/etc", "/var", "/boot"]), True)
32			+fs_mounts = dict.fromkeys(get_config_attr("FS_MOUNTS", ["/", "/home", "/home/e-smith/files", "/home/e-smith/files/ibays", "/home/e-smith/files/users", "/etc", "/var", "/boot", "/tmp"]), True)
33			fs_m_filter = get_config_attr("FS_M_FILTER", False)
34			fs_t_filter = get_config_attr("FS_T_FILTER", False)
35
36			@@ -457,6 +457,9 @@
37			if Gate().grants('devices'):
38			self.devices[udi] = Device(props, self)
39			if udi == '/org/freedesktop/Hal/devices/computer':
40			+ status, systemType = commands.getstatusoutput("/sbin/e-smith/config gettype SystemMode")
41			+ if status == 0:
42			+ props['system.formfactor'] = systemType
43			try:
44			vendor = props['system.vendor']
45			if len(vendor.strip()) == 0: