conf: we shouldn't touch this here

usr/local/etc/inc/config.inc

@@ -178,7 +178,7 @@ else if ($g['booting'] and !file_exists($g['cf_conf_path'] . "/config.xml")  ) {
 				restore_backup("/cf/conf/backup/{$last_backup}");
 			} else {
 				log_error(gettext("No config.xml or config backups found, resetting to factory defaults."));
-				restore_backup('/conf.default/config.xml');
+				restore_backup('/usr/local/etc/config.xml');
 			}
 		}
 

usr/local/etc/inc/config.lib.inc

@@ -593,7 +593,7 @@ function reset_factory_defaults($lock = false) {
 	unlink_if_exists($g['tmp_path'] . "/config.cache");
 
 	/* copy default configuration */
-	copy("{$g['conf_default_path']}/config.xml", "{$g['conf_path']}/config.xml");
+	copy("/usr/local/etc/config.xml", "{$g['conf_path']}/config.xml");
 
 	disable_security_checks();
 

usr/local/etc/inc/globals.inc

@@ -51,7 +51,6 @@ $g = array(
 	"tmp_path" => "/tmp",
 	"conf_path" => "/conf",
 	"ftmp_path" => "/ftmp",
-	"conf_default_path" => "/conf.default",
 	"cf_path" => "/cf",
 	"cf_conf_path" => "/cf/conf",
 	"www_path" => "/usr/local/www",

usr/local/etc/rc

@@ -211,13 +211,11 @@ if [ "$PLATFORM" = "cdrom" ] ; then
 	/bin/mkdir /tmp/unionfs/sbin
 	/bin/mkdir /tmp/unionfs/bin
 	/bin/mkdir /tmp/unionfs/boot
-	/bin/mkdir /tmp/unionfs/confdefault
 	/sbin/mount_unionfs /tmp/unionfs/usr /usr/
 	/sbin/mount_unionfs /tmp/unionfs/root /root/
 	/sbin/mount_unionfs /tmp/unionfs/bin /bin/		
 	/sbin/mount_unionfs /tmp/unionfs/sbin /sbin/	
 	/sbin/mount_unionfs /tmp/unionfs/boot /boot/
-	/sbin/mount_unionfs /tmp/unionfs/confdefault /conf.default/
 	echo "done."
 fi
 

usr/local/etc/rc.cdrom

@@ -20,7 +20,7 @@ if [ ! -f /conf/config.xml ]; then
        device=$(mdconfig -a -t malloc -s ${partsize})
        newfs /dev/${device} > /dev/null 2>&1
        mount /dev/${device} /conf
-       cp /conf.default/* /conf
+       cp /usr/local/etc/config.xml /conf
        mount_nullfs /conf /cf/conf
        echo "done."
 fi