diff options
| author | Scott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com> | 2009-05-31 02:31:31 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com> | 2009-05-31 02:31:31 -0400 |
| commit | 30934c59138898a0562c98d085143b508dc8497b (patch) | |
| tree | 8fd0fbee46c50d1fbf0533a39c21abadae8642af /etc | |
| parent | 34bb5b72bcfcda3f5d112db2ad4183504c4fb5c9 (diff) | |
| download | pfsense-30934c59138898a0562c98d085143b508dc8497b.zip pfsense-30934c59138898a0562c98d085143b508dc8497b.tar.gz | |
Set hostname then call hostid
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/system.inc | 7 | ||||
| -rwxr-xr-x | etc/rc | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index c493ccd..779925d 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -215,8 +215,13 @@ function system_hostname_configure() { $syscfg = $config['system']; /* set hostname */ - return mwexec("/bin/hostname " . + $status = mwexec("/bin/hostname " . escapeshellarg("{$syscfg['hostname']}.{$syscfg['domain']}")); + + /* Setup host GUID ID. This is used by ZFS. */ + mwexec("/etc/rc.d/hostid start"); + + return $status; } function system_routing_configure() { @@ -270,9 +270,6 @@ fi rm -f /cf/conf/backup/backup.cache -# Setup host GUID ID. This is used by ZFS. -/etc/rc.d/hostid start - # Copy php.ini to alternate location after generation cp /usr/local/lib/php.ini /usr/local/etc/php.ini |
