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 similarity index 100% rename from bootscripts/contrib/lsb-v3/sysconfig/createfiles rename to bootscripts/contrib/lsb-v3/etc/default/createfiles diff --git a/bootscripts/contrib/lsb-v3/sysconfig/modules b/bootscripts/contrib/lsb-v3/etc/default/modules similarity index 100% rename from bootscripts/contrib/lsb-v3/sysconfig/modules rename to bootscripts/contrib/lsb-v3/etc/default/modules diff --git a/bootscripts/contrib/lsb-v3/sysconfig/rc b/bootscripts/contrib/lsb-v3/etc/default/rc similarity index 100% rename from bootscripts/contrib/lsb-v3/sysconfig/rc rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/sysconfig/rc.site rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/checkfs rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/cleanfs rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/console rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/halt rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/lfs-functions rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/localnet rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/modules rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/mountfs rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/mountvirtfs rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/network rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/rc rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/reboot rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/sendsignals rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/setclock rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/swap rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/sysctl rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/sysklogd rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/template rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/udev rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/init.d/udev_retry rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/lsb/init-functions rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/lsb/manage-functions rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/sysconfig/network-devices/services/ipv4-static rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/sysconfig/network-devices/services/ipv4-static-route rename to 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 similarity index 100% rename from bootscripts/contrib/lsb-v3/sysconfig/network-devices/ifdown rename to bootscripts/contrib/lsb-v3/sbin/ifdown diff --git a/bootscripts/contrib/lsb-v3/sysconfig/network-devices/ifup b/bootscripts/contrib/lsb-v3/sbin/ifup similarity index 100% rename from bootscripts/contrib/lsb-v3/sysconfig/network-devices/ifup rename to bootscripts/contrib/lsb-v3/sbin/ifup