MFhead @ r281584

2 files changed, 12 insertions, 5 deletions

diff --git a/etc/login.conf b/etc/login.conf
index 966aa42..ae6b8a0 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -26,7 +26,7 @@ default:\
 	:passwd_format=sha512:\
 	:copyright=/etc/COPYRIGHT:\
 	:welcome=/etc/motd:\
-	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K:LC_COLLATE=C:\
+	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,LC_COLLATE=C:\
 	:path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\
 	:nologin=/var/run/nologin:\
 	:cputime=unlimited:\
diff --git a/etc/rc.d/hostid_save b/etc/rc.d/hostid_save
index fca0521..9741aec 100755
--- a/etc/rc.d/hostid_save
+++ b/etc/rc.d/hostid_save
@@ -16,12 +16,19 @@ rcvar="hostid_enable"
 
 hostid_save()
 {
-	if [ ! -r ${hostid_file} ]; then
-		$SYSCTL_N kern.hostuuid > ${hostid_file}
-		if [ $? -ne 0 ]; then
-			warn "could not store hostuuid in ${hostid_file}."
+	current_hostid=`$SYSCTL_N kern.hostuuid`
+
+	if [ -r ${hostid_file} ]; then
+		read saved_hostid < ${hostid_file}
+		if [ ${saved_hostid} = ${current_hostid} ]; then
+			exit 0
 		fi
 	fi
+
+	echo ${current_hostid} > ${hostid_file}
+	if [ $? -ne 0 ]; then
+		warn "could not store hostuuid in ${hostid_file}."
+	fi
 }
 
 load_rc_config $name