globals: thin out a bit more

src/etc/inc/config.lib.inc

 <?php
 
 /*
-	Copyright (C) 2015 Franco Fichtner <franco@opnsense.org>
+	Copyright (C) 2015-2016 Franco Fichtner <franco@opnsense.org>
 	Ported from config.inc by Erik Kristensen
 	Copyright (C) 2004-2010 Scott Ullrich
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
@@ -29,6 +29,9 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+openlog('opnsense', LOG_ODELAY, LOG_USER);
+register_shutdown_function('closelog');
+
 require_once("globals.inc");
 require_once("xmlparse.inc");
 require_once("crypt.inc");

src/etc/inc/globals.inc

@@ -29,15 +29,11 @@
 
 global $g;
 
-openlog('opnsense', LOG_ODELAY, LOG_USER);
-register_shutdown_function('closelog');
-
 $g = array(
 	"factory_shipped_username" => "root",
 	"factory_shipped_password" => "opnsense",
 	"dhcpd_chroot_path" => "/var/dhcpd",
 	"unbound_chroot_path" => "/var/unbound",
-	"admin_group" => "admins",
 	"product_name" => "OPNsense",
 	"product_website" => "https://opnsense.org",
 	"product_email" => "project@opnsense.org",

src/etc/inc/upgrade_config.inc

@@ -1369,7 +1369,7 @@ function upgrade_048_to_049() {
 	/* work around broken gid assignments */
 	$config['system']['nextgid'] = 2000;
 	foreach ($config['system']['group'] as & $group) {
-		if ($group['name'] == $g['admin_group'])
+		if ($group['name'] == 'admins')
 			$group['gid'] = 1999;
 		else
 			$group['gid'] = $config['system']['nextgid']++;
@@ -1393,7 +1393,7 @@ function upgrade_048_to_049() {
 
 	/* reset group scope information */
 	foreach ($config['system']['group'] as & $group)
-		if ($group['name'] != $g['admin_group'])
+		if ($group['name'] != 'admins')
 		$group['scope'] = "user";
 
 	/* insert new all group */

src/etc/rc.initial.reboot

@@ -27,7 +27,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("globals.inc");
+require_once("config.lib.inc");
 require_once("util.inc");
 require_once("system.inc");