Changed distribution directory structure.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9530 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

31 files changed, 51 insertions, 58 deletions

diff --git a/bootscripts/contrib/lsb-v3/Makefile b/bootscripts/contrib/lsb-v3/Makefile
index a6cef78ba..c07d4eb5b 100644
--- a/bootscripts/contrib/lsb-v3/Makefile
+++ b/bootscripts/contrib/lsb-v3/Makefile
@@ -16,50 +16,45 @@ create-dirs:
 	install -d -m ${DIRMODE} ${EXTDIR}/rc6.d
 	install -d -m ${DIRMODE} ${EXTDIR}/rcS.d
 	install -d -m ${DIRMODE} ${EXTDIR}/init.d
-	install -d -m ${DIRMODE} ${EXTDIR}/sysconfig
+	install -d -m ${DIRMODE} ${EXTDIR}/default
 	install -d -m ${DIRMODE} ${DESTDIR}/lib/lsb
 	install -d -m ${DIRMODE} ${EXTDIR}/lsb/state
+	install -d -m ${DIRMODE} ${DESTDIR}/lib/network-services
 
-create-service-dir:
-	install -d -m ${DIRMODE} ${EXTDIR}/sysconfig/network-devices/services
-
-create-boottemp-dir:
-	install -d -m ${DIRMODE} ${EXTDIR}/init.d/boottemp
-
-install: create-dirs create-service-dir create-boottemp-dir
-	install -m ${MODE} init.d/checkfs               ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/cleanfs               ${EXTDIR}/init.d/
-	install -m ${CONFMODE} init.d/lfs-functions     ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/halt                  ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/console               ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/localnet              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/modules               ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/mountfs               ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/mountvirtfs           ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/network               ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/rc                    ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/reboot                ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/sendsignals           ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/setclock              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/sysklogd              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/swap                  ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/sysctl                ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/template              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/udev                  ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/udev_retry            ${EXTDIR}/init.d/
-	install -m ${CONFMODE} lsb/init-functions       ${DESTDIR}/lib/lsb/
-	install -m ${CONFMODE} lsb/manage-functions     ${DESTDIR}/lib/lsb/
+install: create-dirs
+	install -m ${MODE} etc/init.d/checkfs               ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/cleanfs               ${EXTDIR}/init.d/
+	install -m ${CONFMODE} etc/init.d/lfs-functions     ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/halt                  ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/console               ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/localnet              ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/modules               ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/mountfs               ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/mountvirtfs           ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/network               ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/rc                    ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/reboot                ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/sendsignals           ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/setclock              ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/sysklogd              ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/swap                  ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/sysctl                ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/template              ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/udev                  ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/udev_retry            ${EXTDIR}/init.d/
+	install -m ${CONFMODE} lib/lsb/init-functions       ${DESTDIR}/lib/lsb/
+	install -m ${CONFMODE} lib/lsb/manage-functions     ${DESTDIR}/lib/lsb/
 	install -m ${CONFMODE} etc/lsb-config           ${EXTDIR}/lsb/
-	if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then install -m ${CONFMODE} sysconfig/createfiles ${EXTDIR}/sysconfig/; fi
-	if [ ! -f ${EXTDIR}/sysconfig/modules     ]; then install -m ${CONFMODE} sysconfig/modules     ${EXTDIR}/sysconfig/; fi
-	if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} sysconfig/rc          ${EXTDIR}/sysconfig/; fi
-	if [ ! -f ${EXTDIR}/sysconfig/rc.site     ]; then install -m ${CONFMODE} sysconfig/rc.site     ${EXTDIR}/sysconfig/; fi
+	if [ ! -f ${EXTDIR}/default/createfiles ]; then install -m ${CONFMODE} etc/default/createfiles ${EXTDIR}/default/; fi
+	if [ ! -f ${EXTDIR}/default/modules     ]; then install -m ${CONFMODE} etc/default/modules     ${EXTDIR}/default/; fi
+	if [ ! -f ${EXTDIR}/default/rc          ]; then install -m ${CONFMODE} etc/default/rc          ${EXTDIR}/default/; fi
+	if [ ! -f ${EXTDIR}/default/rc.site     ]; then install -m ${CONFMODE} etc/default/rc.site     ${EXTDIR}/default/; fi
 	if [ -f   ${EXTDIR}/inittab               ]; then install -m ${CONFMODE} ${EXTDIR}/inittab     ${EXTDIR}/inittab.bak; fi
 	install                   -m ${CONFMODE} etc/inittab ${EXTDIR}/
-	install                   -m ${MODE} sysconfig/network-devices/ifup   ${EXTDIR}/sysconfig/network-devices/
-	install                   -m ${MODE} sysconfig/network-devices/ifdown ${EXTDIR}/sysconfig/network-devices/
-	install                   -m ${MODE} sysconfig/network-devices/services/ipv4-static       ${EXTDIR}/sysconfig/network-devices/services/
-	install                   -m ${MODE} sysconfig/network-devices/services/ipv4-static-route ${EXTDIR}/sysconfig/network-devices/services/
+	install                   -m ${MODE} sbin/ifup   ${DESTDIR}/sbin/
+	install                   -m ${MODE} sbin/ifdown ${DESTDIR}/sbin/
+	install                   -m ${MODE} lib/network-services/ipv4-static       ${DESTDIR}/lib/network-services/
+	install                   -m ${MODE} lib/network-services/ipv4-static-route ${DESTDIR}/lib/network-services/
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/checkfs
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/cleanfs
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/halt
@@ -77,24 +72,24 @@ install: create-dirs create-service-dir create-boottemp-dir
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev_retry
 
-minimal: create-dirs create-service-dir create-boottemp-dir
-	install -m ${MODE} init.d/checkfs           ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/cleanfs           ${EXTDIR}/init.d/
-	install -m ${CONFMODE} init.d/lfs-functions ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/halt              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/localnet          ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/mountfs           ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/mountvirtfs       ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/rc                ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/reboot            ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/sendsignals       ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/setclock          ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/swap              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/udev              ${EXTDIR}/init.d/
-	install -m ${CONFMODE} lsb/init-functions   ${DESTDIR}/lib/lsb/
-	install -m ${CONFMODE} lsb/manage-functions ${DESTDIR}/lib/lsb/
+minimal: create-dirs
+	install -m ${MODE} etc/init.d/checkfs           ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/cleanfs           ${EXTDIR}/init.d/
+	install -m ${CONFMODE} etc/init.d/lfs-functions ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/halt              ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/localnet          ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/mountfs           ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/mountvirtfs       ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/rc                ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/reboot            ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/sendsignals       ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/detclock          ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/swap              ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/udev              ${EXTDIR}/init.d/
+	install -m ${CONFMODE} lib/lsb/init-functions   ${DESTDIR}/lib/lsb/
+	install -m ${CONFMODE} lib/lsb/manage-functions ${DESTDIR}/lib/lsb/
 	install -m ${CONFMODE} etc/lsb-config       ${EXTDIR}/lsb/
-	if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} sysconfig/rc          ${EXTDIR}/sysconfig/; fi
+	if [ ! -f ${EXTDIR}/default/rc          ]; then install -m ${CONFMODE} default/rc          ${EXTDIR}/default/; fi
 	if [ -f   ${EXTDIR}/inittab               ]; then install -m ${CONFMODE} ${EXTDIR}/inittab     ${EXTDIR}/inittab.bak; fi
 	install                   -m ${CONFMODE} etc/inittab ${EXTDIR}/
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/checkfs
@@ -105,10 +100,8 @@ minimal: create-dirs create-service-dir create-boottemp-dir
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/mountvirtfs
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/reboot
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/sendsignals
-	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/setclock
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/swap
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev
 
-.PHONY: all create-dirs create-service-dir create-boottemp-dir \
-	install minimal 
+.PHONY: all create-dirs install minimal
 
diff --git a/bootscripts/contrib/lsb-v3/sysconfig/createfiles b/bootscripts/contrib/lsb-v3/etc/default/createfiles
index 8d1f89dc6..8d1f89dc6 100644
--- a/bootscripts/contrib/lsb-v3/sysconfig/createfiles
+++ b/bootscripts/contrib/lsb-v3/etc/default/createfiles
diff --git a/bootscripts/contrib/lsb-v3/sysconfig/modules b/bootscripts/contrib/lsb-v3/etc/default/modules
index 1c8493d45..1c8493d45 100644
--- a/bootscripts/contrib/lsb-v3/sysconfig/modules
+++ b/bootscripts/contrib/lsb-v3/etc/default/modules
diff --git a/bootscripts/contrib/lsb-v3/sysconfig/rc b/bootscripts/contrib/lsb-v3/etc/default/rc
index ffb70d98c..ffb70d98c 100644
--- a/bootscripts/contrib/lsb-v3/sysconfig/rc
+++ b/bootscripts/contrib/lsb-v3/etc/default/rc
diff --git a/bootscripts/contrib/lsb-v3/sysconfig/rc.site b/bootscripts/contrib/lsb-v3/etc/default/rc.site
index f3369db58..f3369db58 100644
--- a/bootscripts/contrib/lsb-v3/sysconfig/rc.site
+++ b/bootscripts/contrib/lsb-v3/etc/default/rc.site
diff --git a/bootscripts/contrib/lsb-v3/init.d/checkfs b/bootscripts/contrib/lsb-v3/etc/init.d/checkfs
index 1e3efed9b..1e3efed9b 100644
--- a/bootscripts/contrib/lsb-v3/init.d/checkfs
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/checkfs
diff --git a/bootscripts/contrib/lsb-v3/init.d/cleanfs b/bootscripts/contrib/lsb-v3/etc/init.d/cleanfs
index 96582c28c..96582c28c 100644
--- a/bootscripts/contrib/lsb-v3/init.d/cleanfs
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/cleanfs
diff --git a/bootscripts/contrib/lsb-v3/init.d/console b/bootscripts/contrib/lsb-v3/etc/init.d/console
index 8b26f57d5..8b26f57d5 100644
--- a/bootscripts/contrib/lsb-v3/init.d/console
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/console
diff --git a/bootscripts/contrib/lsb-v3/init.d/halt b/bootscripts/contrib/lsb-v3/etc/init.d/halt
index cdcd90778..cdcd90778 100644
--- a/bootscripts/contrib/lsb-v3/init.d/halt
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/halt
diff --git a/bootscripts/contrib/lsb-v3/init.d/lfs-functions b/bootscripts/contrib/lsb-v3/etc/init.d/lfs-functions
index b0fef4c29..b0fef4c29 100644
--- a/bootscripts/contrib/lsb-v3/init.d/lfs-functions
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/lfs-functions
diff --git a/bootscripts/contrib/lsb-v3/init.d/localnet b/bootscripts/contrib/lsb-v3/etc/init.d/localnet
index 322bb8749..322bb8749 100644
--- a/bootscripts/contrib/lsb-v3/init.d/localnet
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/localnet
diff --git a/bootscripts/contrib/lsb-v3/init.d/modules b/bootscripts/contrib/lsb-v3/etc/init.d/modules
index 2dd1d7212..2dd1d7212 100644
--- a/bootscripts/contrib/lsb-v3/init.d/modules
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/modules
diff --git a/bootscripts/contrib/lsb-v3/init.d/mountfs b/bootscripts/contrib/lsb-v3/etc/init.d/mountfs
index 562db546a..562db546a 100644
--- a/bootscripts/contrib/lsb-v3/init.d/mountfs
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/mountfs
diff --git a/bootscripts/contrib/lsb-v3/init.d/mountvirtfs b/bootscripts/contrib/lsb-v3/etc/init.d/mountvirtfs
index e458f9c7f..e458f9c7f 100644
--- a/bootscripts/contrib/lsb-v3/init.d/mountvirtfs
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/mountvirtfs
diff --git a/bootscripts/contrib/lsb-v3/init.d/network b/bootscripts/contrib/lsb-v3/etc/init.d/network
index 29d4d54c8..29d4d54c8 100644
--- a/bootscripts/contrib/lsb-v3/init.d/network
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/network
diff --git a/bootscripts/contrib/lsb-v3/init.d/rc b/bootscripts/contrib/lsb-v3/etc/init.d/rc
index 24e26ee07..24e26ee07 100644
--- a/bootscripts/contrib/lsb-v3/init.d/rc
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/rc
diff --git a/bootscripts/contrib/lsb-v3/init.d/reboot b/bootscripts/contrib/lsb-v3/etc/init.d/reboot
index 56e948a3f..56e948a3f 100644
--- a/bootscripts/contrib/lsb-v3/init.d/reboot
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/reboot
diff --git a/bootscripts/contrib/lsb-v3/init.d/sendsignals b/bootscripts/contrib/lsb-v3/etc/init.d/sendsignals
index 2cd9df84a..2cd9df84a 100644
--- a/bootscripts/contrib/lsb-v3/init.d/sendsignals
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/sendsignals
diff --git a/bootscripts/contrib/lsb-v3/init.d/setclock b/bootscripts/contrib/lsb-v3/etc/init.d/setclock
index 5d47b8dc8..5d47b8dc8 100644
--- a/bootscripts/contrib/lsb-v3/init.d/setclock
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/setclock
diff --git a/bootscripts/contrib/lsb-v3/init.d/swap b/bootscripts/contrib/lsb-v3/etc/init.d/swap
index 31e5591e5..31e5591e5 100644
--- a/bootscripts/contrib/lsb-v3/init.d/swap
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/swap
diff --git a/bootscripts/contrib/lsb-v3/init.d/sysctl b/bootscripts/contrib/lsb-v3/etc/init.d/sysctl
index cccff126e..cccff126e 100644
--- a/bootscripts/contrib/lsb-v3/init.d/sysctl
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/sysctl
diff --git a/bootscripts/contrib/lsb-v3/init.d/sysklogd b/bootscripts/contrib/lsb-v3/etc/init.d/sysklogd
index dc8829f07..dc8829f07 100644
--- a/bootscripts/contrib/lsb-v3/init.d/sysklogd
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/sysklogd
diff --git a/bootscripts/contrib/lsb-v3/init.d/template b/bootscripts/contrib/lsb-v3/etc/init.d/template
index cb3222a35..cb3222a35 100644
--- a/bootscripts/contrib/lsb-v3/init.d/template
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/template
diff --git a/bootscripts/contrib/lsb-v3/init.d/udev b/bootscripts/contrib/lsb-v3/etc/init.d/udev
index ac91fccf3..ac91fccf3 100644
--- a/bootscripts/contrib/lsb-v3/init.d/udev
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/udev
diff --git a/bootscripts/contrib/lsb-v3/init.d/udev_retry b/bootscripts/contrib/lsb-v3/etc/init.d/udev_retry
index 24b956ae0..24b956ae0 100644
--- a/bootscripts/contrib/lsb-v3/init.d/udev_retry
+++ b/bootscripts/contrib/lsb-v3/etc/init.d/udev_retry
diff --git a/bootscripts/contrib/lsb-v3/lsb/init-functions b/bootscripts/contrib/lsb-v3/lib/lsb/init-functions
index d422a5b82..d422a5b82 100644
--- a/bootscripts/contrib/lsb-v3/lsb/init-functions
+++ b/bootscripts/contrib/lsb-v3/lib/lsb/init-functions
diff --git a/bootscripts/contrib/lsb-v3/lsb/manage-functions b/bootscripts/contrib/lsb-v3/lib/lsb/manage-functions
index 7c7a8f495..7c7a8f495 100644
--- a/bootscripts/contrib/lsb-v3/lsb/manage-functions
+++ b/bootscripts/contrib/lsb-v3/lib/lsb/manage-functions
diff --git a/bootscripts/contrib/lsb-v3/sysconfig/network-devices/services/ipv4-static b/bootscripts/contrib/lsb-v3/lib/network-services/ipv4-static
index 417d22de6..417d22de6 100644
--- a/bootscripts/contrib/lsb-v3/sysconfig/network-devices/services/ipv4-static
+++ b/bootscripts/contrib/lsb-v3/lib/network-services/ipv4-static
diff --git a/bootscripts/contrib/lsb-v3/sysconfig/network-devices/services/ipv4-static-route b/bootscripts/contrib/lsb-v3/lib/network-services/ipv4-static-route
index 4205a022d..4205a022d 100644
--- a/bootscripts/contrib/lsb-v3/sysconfig/network-devices/services/ipv4-static-route
+++ b/bootscripts/contrib/lsb-v3/lib/network-services/ipv4-static-route
diff --git a/bootscripts/contrib/lsb-v3/sysconfig/network-devices/ifdown b/bootscripts/contrib/lsb-v3/sbin/ifdown
index 28d1f1813..28d1f1813 100644
--- a/bootscripts/contrib/lsb-v3/sysconfig/network-devices/ifdown
+++ b/bootscripts/contrib/lsb-v3/sbin/ifdown
diff --git a/bootscripts/contrib/lsb-v3/sysconfig/network-devices/ifup b/bootscripts/contrib/lsb-v3/sbin/ifup
index 50e173ca6..50e173ca6 100644
--- a/bootscripts/contrib/lsb-v3/sysconfig/network-devices/ifup
+++ b/bootscripts/contrib/lsb-v3/sbin/ifup