[Clfs-commits] commit: r42 - in /trunk/standard: Changelog Makefile
svn at cross-lfs.org
svn at cross-lfs.org
Mon Feb 2 19:11:03 PST 2009
Author: jim
Date: Tue Feb 3 03:11:02 2009
New Revision: 42
Log:
Boot Script Updates - Moved Network to Separate Install
Modified:
trunk/standard/Changelog
trunk/standard/Makefile
Modified: trunk/standard/Changelog
==============================================================================
--- trunk/standard/Changelog (original)
+++ trunk/standard/Changelog Tue Feb 3 03:11:02 2009
@@ -1,12 +1,16 @@
-jim - Janurary 31, 2009
+jim - February 2, 2009
+ * Fixed Makefile
+ * Moved Network to install-network
+
+jim - January 31, 2009
* Moved syklogd to cblfs
* Added rsyslog to clfs
-jim - Janurary 14, 2009
+jim - January 14, 2009
* Fixed Netboot Udev Setup
* Remove all script directories for netboot
-jim - Janurary 8, 2009
+jim - January 8, 2009
* Remove Console Script
* Added i18n Script
Modified: trunk/standard/Makefile
==============================================================================
--- trunk/standard/Makefile (original)
+++ trunk/standard/Makefile Tue Feb 3 03:11:02 2009
@@ -1,5 +1,4 @@
ETCDIR=/etc
-LIBDIR=/lib
SHELL=/bin/bash
EXTDIR=${DESTDIR}${ETCDIR}
MODE=754
@@ -19,36 +18,36 @@
install -d -m ${DIRMODE} ${EXTDIR}/sysconfig/network-devices/services
udev_device_dirs:
- install -d -m ${DIRMODE} ${DESTDIR}${LIBDIR}/udev/devices/{pts,shm,net}
+ install -d -m ${DIRMODE} ${DESTDIR}/lib/udev/devices/{pts,shm,net}
udev_device_links: udev_device_dirs
- ln -snf /proc/self/fd ${DESTDIR}${LIBDIR}/udev/devices/fd
- ln -snf /proc/self/fd/0 ${DESTDIR}${LIBDIR}/udev/devices/stdin
- ln -snf /proc/self/fd/1 ${DESTDIR}${LIBDIR}/udev/devices/stdout
- ln -snf /proc/self/fd/2 ${DESTDIR}${LIBDIR}/udev/devices/stderr
- ln -snf /proc/kcore ${DESTDIR}${LIBDIR}/udev/devices/core
+ ln -snf /proc/self/fd ${DESTDIR}/lib/udev/devices/fd
+ ln -snf /proc/self/fd/0 ${DESTDIR}/lib/udev/devices/stdin
+ ln -snf /proc/self/fd/1 ${DESTDIR}/lib/udev/devices/stdout
+ ln -snf /proc/self/fd/2 ${DESTDIR}/lib/udev/devices/stderr
+ ln -snf /proc/kcore ${DESTDIR}/lib/udev/devices/core
mknod_devices: udev_device_dirs
@if [ "$$UID" = "0" ]; then \
- if ! [ -e ${DESTDIR}${LIBDIR}/udev/devices/null ]; then \
- mknod -m 0666 ${DESTDIR}${LIBDIR}/udev/devices/null c 1 3 ;\
+ if ! [ -e ${DESTDIR}/lib/udev/devices/null ]; then \
+ mknod -m 0666 ${DESTDIR}/lib/udev/devices/null c 1 3 ;\
fi \
fi
@if [ "$$UID" = "0" ]; then \
- if ! [ -e ${DESTDIR}${LIBDIR}/udev/devices/console ]; then \
- mknod -m 0600 ${DESTDIR}${LIBDIR}/udev/devices/console c 5 1 ;\
+ if ! [ -e ${DESTDIR}/lib/udev/devices/console ]; then \
+ mknod -m 0600 ${DESTDIR}/lib/udev/devices/console c 5 1 ;\
fi \
fi
@if [ "$$UID" != "0" ]; then \
- if ! [ -e ${DESTDIR}${LIBDIR}/udev/devices/null ]; then \
+ if ! [ -e ${DESTDIR}/lib/udev/devices/null ]; then \
echo "You will need to issue the following command as the root user" ;\
echo "" ;\
- echo "mknod -m 0666 ${DESTDIR}${LIBDIR}/udev/devices/null c 1 3" ;\
+ echo "mknod -m 0666 ${DESTDIR}/lib/udev/devices/null c 1 3" ;\
fi \
fi
@if [ "$$UID" != "0" ]; then \
- if ! [ -e ${DESTDIR}${LIBDIR}/udev/devices/console ]; then \
- echo "mknod -m 0600 ${DESTDIR}${LIBDIR}/udev/devices/console c 5 1" ;\
+ if ! [ -e ${DESTDIR}/lib/udev/devices/console ]; then \
+ echo "mknod -m 0600 ${DESTDIR}/lib/udev/devices/console c 5 1" ;\
echo "" ;\
fi \
fi
@@ -65,7 +64,6 @@
install -m ${MODE} clfs/init.d/modules ${EXTDIR}/rc.d/init.d/
install -m ${MODE} clfs/init.d/mountfs ${EXTDIR}/rc.d/init.d/
install -m ${MODE} clfs/init.d/mountkernfs ${EXTDIR}/rc.d/init.d/
- install -m ${MODE} clfs/init.d/network ${EXTDIR}/rc.d/init.d/
install -m ${MODE} clfs/init.d/rc ${EXTDIR}/rc.d/init.d/
install -m ${MODE} clfs/init.d/reboot ${EXTDIR}/rc.d/init.d/
install -m ${MODE} clfs/init.d/sendsignals ${EXTDIR}/rc.d/init.d/
@@ -75,24 +73,17 @@
install -m ${MODE} clfs/init.d/sysctl ${EXTDIR}/rc.d/init.d/
install -m ${MODE} clfs/init.d/template ${EXTDIR}/rc.d/init.d/
install -m ${MODE} clfs/init.d/udev ${EXTDIR}/rc.d/init.d/
- ln -sf ../init.d/network ${EXTDIR}/rc.d/rc0.d/K80network
ln -sf ../init.d/rsyslog ${EXTDIR}/rc.d/rc0.d/K90rsyslog
ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rc0.d/S70mountfs
ln -sf ../init.d/swap ${EXTDIR}/rc.d/rc0.d/S80swap
ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rc0.d/S90localnet
ln -sf ../init.d/halt ${EXTDIR}/rc.d/rc0.d/S99halt
- ln -sf ../init.d/network ${EXTDIR}/rc.d/rc1.d/K80network
ln -sf ../init.d/rsyslog ${EXTDIR}/rc.d/rc1.d/S10rsyslog
- ln -sf ../init.d/network ${EXTDIR}/rc.d/rc2.d/S20network
ln -sf ../init.d/rsyslog ${EXTDIR}/rc.d/rc2.d/S10rsyslog
ln -sf ../init.d/rsyslog ${EXTDIR}/rc.d/rc3.d/S10rsyslog
- ln -sf ../init.d/network ${EXTDIR}/rc.d/rc3.d/S20network
ln -sf ../init.d/rsyslog ${EXTDIR}/rc.d/rc4.d/S10rsyslog
- ln -sf ../init.d/network ${EXTDIR}/rc.d/rc4.d/S20network
ln -sf ../init.d/rsyslog ${EXTDIR}/rc.d/rc5.d/S10rsyslog
- ln -sf ../init.d/network ${EXTDIR}/rc.d/rc5.d/S20network
- ln -sf ../init.d/network ${EXTDIR}/rc.d/rc6.d/K80network
ln -sf ../init.d/rsyslog ${EXTDIR}/rc.d/rc6.d/K90rsyslog
ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rc6.d/S70mountfs
@@ -116,11 +107,22 @@
if [ ! -f ${EXTDIR}/sysconfig/i18n ]; then install -m ${CONFMODE} clfs/sysconfig/i18n ${EXTDIR}/sysconfig/; fi
if [ ! -f ${EXTDIR}/sysconfig/modules ]; then install -m ${CONFMODE} clfs/sysconfig/modules ${EXTDIR}/sysconfig/; fi
if [ ! -f ${EXTDIR}/sysconfig/rc ]; then install -m ${CONFMODE} clfs/sysconfig/rc ${EXTDIR}/sysconfig/; fi
+ @$(MAKE) mknod_devices
+
+install-network: create-dirs create-service-dir
+
+ install -m ${MODE} clfs/init.d/network ${EXTDIR}/rc.d/init.d/
+ ln -sf ../init.d/network ${EXTDIR}/rc.d/rc0.d/K80network
+ ln -sf ../init.d/network ${EXTDIR}/rc.d/rc1.d/K80network
+ ln -sf ../init.d/network ${EXTDIR}/rc.d/rc2.d/S20network
+ ln -sf ../init.d/network ${EXTDIR}/rc.d/rc3.d/S20network
+ ln -sf ../init.d/network ${EXTDIR}/rc.d/rc4.d/S20network
+ ln -sf ../init.d/network ${EXTDIR}/rc.d/rc5.d/S20network
+ ln -sf ../init.d/network ${EXTDIR}/rc.d/rc6.d/K80network
install -m ${MODE} clfs/sysconfig/network-devices/ifup ${EXTDIR}/sysconfig/network-devices/
install -m ${MODE} clfs/sysconfig/network-devices/ifdown ${EXTDIR}/sysconfig/network-devices/
install -m ${MODE} clfs/sysconfig/network-devices/services/ipv4-static ${EXTDIR}/sysconfig/network-devices/services/
install -m ${MODE} clfs/sysconfig/network-devices/services/ipv4-static-route ${EXTDIR}/sysconfig/network-devices/services/
- @$(MAKE) mknod_devices
install-service-mtu: create-service-dir
install -m ${MODE} contrib/sysconfig/network-devices/services/mtu ${EXTDIR}/sysconfig/network-devices/services
@@ -1204,7 +1206,10 @@
rm -f ${EXTDIR}/rc.d/rc6.d/K49xinetd
.PHONY: all create-dirs create-service-dir \
- install \
+ install \
+ install-bootscripts \
+ install-network \
+ install-dhcpcd \
install-service-mtu \
minimal \
install-lcd \
@@ -1249,6 +1254,7 @@
install-sshd \
install-stunnel \
install-svn \
+ install-sysklogd \
install-syslog-ng \
install-sysstat \
install-vsftpd \
More information about the Clfs-commits
mailing list