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 17:37:55.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-02-27 12:05:44.000000000 -0700 +++ smolt-1.4.3/client/os_detect.py 2010-03-03 17:37:55.000000000 -0700 @@ -56,6 +56,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 17:37:30.000000000 -0700 +++ smolt-1.4.3/client/smolt.py 2010-03-03 17:37:55.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) @@ -437,6 +437,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: diff -up smolt-1.4.3.sme/client/smolt.cron.monthly smolt-1.4.3/client/smolt.cron.monthly --- smolt-1.4.3.sme/client/smolt.cron.monthly 2010-02-27 12:05:44.000000000 -0700 +++ smolt-1.4.3/client/smolt.cron.monthly 2010-03-06 09:49:28.000000000 -0700 @@ -2,4 +2,4 @@ # Please note that calling with -c will cause smolt to pause a random amount of # time between 0 and 3 days before actually sending, this is to prevent ddos on # the server -20 1 1 * * smolt /usr/bin/smoltSendProfile -c > /dev/null 2>&1 +20 1 1 * * root /usr/bin/smoltSendProfile -c > /dev/null 2>&1