sysfiles: changed to use overlay_apply()

16 years ago · 9fcca7fa9b
30 changed files with 2 additions and 10 deletions
--- a/base/sysfiles/overlay.d/etc_conf_NOTE.txt
+++ b/base/sysfiles/overlay.d/etc_conf_NOTE.txt
--- a/base/sysfiles/overlay.d/etc_conf_console.txt
+++ b/base/sysfiles/overlay.d/etc_conf_console.txt
--- a/base/sysfiles/overlay.d/etc_conf_devfs.txt
+++ b/base/sysfiles/overlay.d/etc_conf_devfs.txt
--- a/base/sysfiles/overlay.d/etc_conf_hardware.txt
+++ b/base/sysfiles/overlay.d/etc_conf_hardware.txt
--- a/base/sysfiles/overlay.d/etc_conf_kbd.txt
+++ b/base/sysfiles/overlay.d/etc_conf_kbd.txt
--- a/base/sysfiles/overlay.d/etc_conf_kernel.txt
+++ b/base/sysfiles/overlay.d/etc_conf_kernel.txt
--- a/base/sysfiles/overlay.d/etc_conf_pci.txt
+++ b/base/sysfiles/overlay.d/etc_conf_pci.txt
--- a/base/sysfiles/overlay.d/etc_conf_profile.txt
+++ b/base/sysfiles/overlay.d/etc_conf_profile.txt
--- a/base/sysfiles/overlay.d/etc_conf_usb.txt
+++ b/base/sysfiles/overlay.d/etc_conf_usb.txt
--- a/base/sysfiles/overlay.d/etc_dircolors.txt
+++ b/base/sysfiles/overlay.d/etc_dircolors.txt
--- a/base/sysfiles/overlay.d/etc_filesystems.txt
+++ b/base/sysfiles/overlay.d/etc_filesystems.txt
--- a/base/sysfiles/overlay.d/etc_fstab.txt
+++ b/base/sysfiles/overlay.d/etc_fstab.txt
--- a/base/sysfiles/overlay.d/etc_group.txt
+++ b/base/sysfiles/overlay.d/etc_group.txt
--- a/base/sysfiles/overlay.d/etc_gshadow.txt
+++ b/base/sysfiles/overlay.d/etc_gshadow.txt
--- a/base/sysfiles/overlay.d/etc_host.conf.txt
+++ b/base/sysfiles/overlay.d/etc_host.conf.txt
--- a/base/sysfiles/overlay.d/etc_hosts.txt
+++ b/base/sysfiles/overlay.d/etc_hosts.txt
--- a/base/sysfiles/overlay.d/etc_init.d_functions-ansi.in.txt
+++ b/base/sysfiles/overlay.d/etc_init.d_functions-ansi.in.txt
--- a/base/sysfiles/overlay.d/etc_init.d_functions.in.txt
+++ b/base/sysfiles/overlay.d/etc_init.d_functions.in.txt
--- a/base/sysfiles/overlay.d/etc_initscript.txt
+++ b/base/sysfiles/overlay.d/etc_initscript.txt
--- a/base/sysfiles/overlay.d/etc_inputrc.txt
+++ b/base/sysfiles/overlay.d/etc_inputrc.txt
--- a/base/sysfiles/overlay.d/etc_networks.txt
+++ b/base/sysfiles/overlay.d/etc_networks.txt
--- a/base/sysfiles/overlay.d/etc_passwd.txt
+++ b/base/sysfiles/overlay.d/etc_passwd.txt
--- a/base/sysfiles/overlay.d/etc_profile.txt
+++ b/base/sysfiles/overlay.d/etc_profile.txt
--- a/base/sysfiles/overlay.d/etc_rc.d_rc.txt
+++ b/base/sysfiles/overlay.d/etc_rc.d_rc.txt
--- a/base/sysfiles/overlay.d/etc_resolv.conf.txt
+++ b/base/sysfiles/overlay.d/etc_resolv.conf.txt
--- a/base/sysfiles/overlay.d/etc_sakmsg.txt
+++ b/base/sysfiles/overlay.d/etc_sakmsg.txt
--- a/base/sysfiles/overlay.d/etc_shadow.txt
+++ b/base/sysfiles/overlay.d/etc_shadow.txt
--- a/base/sysfiles/overlay.d/etc_shells.txt
+++ b/base/sysfiles/overlay.d/etc_shells.txt
--- a/base/sysfiles/overlay.d/etc_sysctl.conf.txt
+++ b/base/sysfiles/overlay.d/etc_sysctl.conf.txt
--- a/base/sysfiles/sysfiles.conf
+++ b/base/sysfiles/sysfiles.conf
@ -18,16 +18,8 @@ main_sf() {
 	cd $root/

 	echo "Creating various etc/* files ..."
-	for x in $( cd $confdir ; echo etc_*.txt ) ; do
-		y="${x%.txt}" ; z="/"
-		if [ -f "${y//_/$z}" ]
-		then
-			echo "Found old ${y//_/$z} (don't overwrite)."
-			touch "${y//_/$z}"
-		else
-			cp -v "$confdir/$x" "${y//_/$z}"
-		fi
-	done
+	overlay_apply -n "$confdir/overlay.d"
+
 	[ -f etc/HOSTNAME ] || echo localhost > etc/HOSTNAME
 	chmod +x etc/initscript etc/rc.d/rc