From: <ch...@us...> - 2007-11-14 06:30:02
|
Revision: 705 http://ipcop.svn.sourceforge.net/ipcop/?rev=705&view=rev Author: chepati Date: 2007-11-13 22:30:04 -0800 (Tue, 13 Nov 2007) Log Message: ----------- Reverting the initscripts to 701. I rushed this. Modified Paths: -------------- ipcop/trunk/config/etc/inittab ipcop/trunk/config/rootfiles/common/initscripts ipcop/trunk/lfs/initscripts ipcop/trunk/make.sh Removed Paths: ------------- ipcop/trunk/config/rootfiles/common/lfs-bootscripts ipcop/trunk/lfs/lfs-bootscripts Modified: ipcop/trunk/config/etc/inittab =================================================================== --- ipcop/trunk/config/etc/inittab 2007-11-14 05:35:51 UTC (rev 704) +++ ipcop/trunk/config/etc/inittab 2007-11-14 06:30:04 UTC (rev 705) @@ -1,29 +1,20 @@ # # $Id$ # -# Begin /etc/inittab - id:3:initdefault: -si::sysinit:/etc/rc.d/init.d/rc sysinit +l0:0:wait:/etc/rc.d/rc.halt halt +l6:6:wait:/etc/rc.d/rc.halt reboot -l0:0:wait:/etc/rc.d/init.d/rc 0 -l1:S1:wait:/etc/rc.d/init.d/rc 1 -l2:2:wait:/etc/rc.d/init.d/rc 2 -l3:3:wait:/etc/rc.d/init.d/rc 3 -l4:4:wait:/etc/rc.d/init.d/rc 4 -l5:5:wait:/etc/rc.d/init.d/rc 5 -l6:6:wait:/etc/rc.d/init.d/rc 6 +si::sysinit:/etc/rc.d/rc.sysinit -ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now +# Trap CTRL-ALT-DELETE +ca::ctrlaltdel:/sbin/shutdown -r now -su:S016:once:/sbin/sulogin - -1:2345:respawn:/sbin/agetty tty1 9600 -2:2345:respawn:/sbin/agetty tty2 9600 -3:2345:respawn:/sbin/agetty tty3 9600 -4:2345:respawn:/sbin/agetty tty4 9600 -5:2345:respawn:/sbin/agetty tty5 9600 -6:2345:respawn:/sbin/agetty tty6 9600 - -# End /etc/inittab +# Run gettys in standard runlevels +1:2345:respawn:/sbin/mingetty tty1 +2:2345:respawn:/sbin/mingetty tty2 +3:2345:respawn:/sbin/mingetty tty3 +4:2345:respawn:/sbin/mingetty tty4 +5:2345:respawn:/sbin/mingetty tty5 +6:2345:respawn:/sbin/mingetty tty6 Modified: ipcop/trunk/config/rootfiles/common/initscripts =================================================================== --- ipcop/trunk/config/rootfiles/common/initscripts 2007-11-14 05:35:51 UTC (rev 704) +++ ipcop/trunk/config/rootfiles/common/initscripts 2007-11-14 06:30:04 UTC (rev 705) @@ -1,32 +1,32 @@ ## initscripts ## -#etc/rc.d/init.d/ipcop -#etc/rc.d/init.d/ipcop/helper -etc/rc.d/init.d/ipcop/helper/getdnsfromdhcpc.pl -etc/rc.d/init.d/ipcop/helper/writeipac.pl -etc/rc.d/init.d/ipcop/rc.3cp4218usbadsl -etc/rc.d/init.d/ipcop/rc.alcatelusb -etc/rc.d/init.d/ipcop/rc.alcatelusbk -etc/rc.d/init.d/ipcop/rc.amedynusbadsl -etc/rc.d/init.d/ipcop/rc.bewanadsl -etc/rc.d/init.d/ipcop/rc.conexantusbadsl -etc/rc.d/init.d/ipcop/rc.conexantpciadsl -etc/rc.d/init.d/ipcop/rc.connectioncheck -etc/rc.d/init.d/ipcop/rc.eagleusbadsl -etc/rc.d/init.d/ipcop/rc.eciadsl -etc/rc.d/init.d/ipcop/rc.firewall -etc/rc.d/init.d/ipcop/rc.firewall.local -etc/rc.d/init.d/ipcop/rc.flash.down -etc/rc.d/init.d/ipcop/rc.flash.up -etc/rc.d/init.d/ipcop/rc.fritzdsl -etc/rc.d/init.d/ipcop/rc.halt -etc/rc.d/init.d/ipcop/rc.isdn -etc/rc.d/init.d/ipcop/rc.local -etc/rc.d/init.d/ipcop/rc.netaddress.down -etc/rc.d/init.d/ipcop/rc.netaddress.up -etc/rc.d/init.d/ipcop/rc.network -etc/rc.d/init.d/ipcop/rc.pulsardsl -etc/rc.d/init.d/ipcop/rc.red -etc/rc.d/init.d/ipcop/rc.sysinit -etc/rc.d/init.d/ipcop/rc.updatered -etc/rc.d/init.d/ipcop/rc.wanpipe +#etc/rc.d +#etc/rc.d/helper +etc/rc.d/helper/getdnsfromdhcpc.pl +etc/rc.d/helper/writeipac.pl +etc/rc.d/rc.3cp4218usbadsl +etc/rc.d/rc.alcatelusb +etc/rc.d/rc.alcatelusbk +etc/rc.d/rc.amedynusbadsl +etc/rc.d/rc.bewanadsl +etc/rc.d/rc.conexantusbadsl +etc/rc.d/rc.conexantpciadsl +etc/rc.d/rc.connectioncheck +etc/rc.d/rc.eagleusbadsl +etc/rc.d/rc.eciadsl +etc/rc.d/rc.firewall +etc/rc.d/rc.firewall.local +etc/rc.d/rc.flash.down +etc/rc.d/rc.flash.up +etc/rc.d/rc.fritzdsl +etc/rc.d/rc.halt +etc/rc.d/rc.isdn +etc/rc.d/rc.local +etc/rc.d/rc.netaddress.down +etc/rc.d/rc.netaddress.up +etc/rc.d/rc.network +etc/rc.d/rc.pulsardsl +etc/rc.d/rc.red +etc/rc.d/rc.sysinit +etc/rc.d/rc.updatered +etc/rc.d/rc.wanpipe Deleted: ipcop/trunk/config/rootfiles/common/lfs-bootscripts =================================================================== --- ipcop/trunk/config/rootfiles/common/lfs-bootscripts 2007-11-14 05:35:51 UTC (rev 704) +++ ipcop/trunk/config/rootfiles/common/lfs-bootscripts 2007-11-14 06:30:04 UTC (rev 705) @@ -1,83 +0,0 @@ -# -# lfs-bootscripts-6.3 -# -#etc/rc.d -#etc/rc.d/init.d -etc/rc.d/init.d/checkfs -etc/rc.d/init.d/cleanfs -etc/rc.d/init.d/console -etc/rc.d/init.d/consolelog -etc/rc.d/init.d/functions -etc/rc.d/init.d/halt -etc/rc.d/init.d/localnet -etc/rc.d/init.d/modules -etc/rc.d/init.d/mountfs -etc/rc.d/init.d/mountkernfs -etc/rc.d/init.d/network -etc/rc.d/init.d/rc -etc/rc.d/init.d/reboot -etc/rc.d/init.d/sendsignals -etc/rc.d/init.d/setclock -etc/rc.d/init.d/swap -etc/rc.d/init.d/sysctl -etc/rc.d/init.d/sysklogd -etc/rc.d/init.d/template -etc/rc.d/init.d/udev -etc/rc.d/init.d/udev_retry -#etc/rc.d/rc0.d -etc/rc.d/rc0.d/K80network -etc/rc.d/rc0.d/K90sysklogd -etc/rc.d/rc0.d/S60sendsignals -etc/rc.d/rc0.d/S70mountfs -etc/rc.d/rc0.d/S80swap -etc/rc.d/rc0.d/S90localnet -etc/rc.d/rc0.d/S99halt -#etc/rc.d/rc1.d -etc/rc.d/rc1.d/K80network -etc/rc.d/rc1.d/K90sysklogd -#etc/rc.d/rc2.d -etc/rc.d/rc2.d/K80network -etc/rc.d/rc2.d/K90sysklogd -#etc/rc.d/rc3.d -etc/rc.d/rc3.d/S10sysklogd -etc/rc.d/rc3.d/S20network -#etc/rc.d/rc4.d -etc/rc.d/rc4.d/S10sysklogd -etc/rc.d/rc4.d/S20network -#etc/rc.d/rc5.d -etc/rc.d/rc5.d/S10sysklogd -etc/rc.d/rc5.d/S20network -#etc/rc.d/rc6.d -etc/rc.d/rc6.d/K80network -etc/rc.d/rc6.d/K90sysklogd -etc/rc.d/rc6.d/S60sendsignals -etc/rc.d/rc6.d/S70mountfs -etc/rc.d/rc6.d/S80swap -etc/rc.d/rc6.d/S90localnet -etc/rc.d/rc6.d/S99reboot -etc/rc.d/rcsysinit.d -etc/rc.d/rcsysinit.d/S00mountkernfs -etc/rc.d/rcsysinit.d/S02consolelog -etc/rc.d/rcsysinit.d/S05modules -etc/rc.d/rcsysinit.d/S10udev -etc/rc.d/rcsysinit.d/S20swap -etc/rc.d/rcsysinit.d/S25setclock -etc/rc.d/rcsysinit.d/S30checkfs -etc/rc.d/rcsysinit.d/S40mountfs -etc/rc.d/rcsysinit.d/S45udev_retry -etc/rc.d/rcsysinit.d/S50cleanfs -etc/rc.d/rcsysinit.d/S70console -etc/rc.d/rcsysinit.d/S80localnet -etc/rc.d/rcsysinit.d/S90sysctl -#var/ipcop/sysconfig -var/ipcop/sysconfig/clock -var/ipcop/sysconfig/createfiles -var/ipcop/sysconfig/modules -var/ipcop/sysconfig/network -var/ipcop/sysconfig/network-devices -var/ipcop/sysconfig/network-devices/ifdown -var/ipcop/sysconfig/network-devices/ifup -var/ipcop/sysconfig/network-devices/services -var/ipcop/sysconfig/network-devices/services/ipv4-static -var/ipcop/sysconfig/network-devices/services/ipv4-static-route -var/ipcop/sysconfig/rc Modified: ipcop/trunk/lfs/initscripts =================================================================== --- ipcop/trunk/lfs/initscripts 2007-11-14 05:35:51 UTC (rev 704) +++ ipcop/trunk/lfs/initscripts 2007-11-14 06:30:04 UTC (rev 705) @@ -59,21 +59,21 @@ $(TARGET) : $(firstword $(MAKEFILE_LIST)) @$(PREBUILD) - -mkdir -p /etc/rc.d/init.d/ipcop/helper + -mkdir -p /etc/rc.d/helper for i in $(DIR_SRC)/config/rc.d/* ; do \ if [ -f $$i ]; then \ - sed "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i > /etc/rc.d/init.d/ipcop/`basename $$i`; \ + sed "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i > /etc/rc.d/`basename $$i`; \ fi; \ done for i in $(DIR_SRC)/config/rc.d/helper/* ; do \ if [ -f $$i ]; then \ - sed "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i > /etc/rc.d/init.d/ipcop/helper/`basename $$i`; \ + sed "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i > /etc/rc.d/helper/`basename $$i`; \ fi; \ done - chmod -R 755 /etc/rc.d/init.d/ipcop - chgrp nobody /etc/rc.d/init.d/ipcop/rc.red - chmod 4750 /etc/rc.d/init.d/ipcop/rc.red + chmod -R 755 /etc/rc.d + chgrp nobody /etc/rc.d/rc.red + chmod 4750 /etc/rc.d/rc.red @$(POSTBUILD) Deleted: ipcop/trunk/lfs/lfs-bootscripts =================================================================== --- ipcop/trunk/lfs/lfs-bootscripts 2007-11-14 05:35:51 UTC (rev 704) +++ ipcop/trunk/lfs/lfs-bootscripts 2007-11-14 06:30:04 UTC (rev 705) @@ -1,105 +0,0 @@ -############################################################################### -# This file is part of the IPCop Firewall. # -# # -# IPCop is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPCop is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard <ro...@su...> # -# # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < ma...@wo...> # -# - Modified Makefile for IPCop build # -# # -# $Id: lfs-bootscripts 329 2007-05-01 06:25:54Z chepati $ -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -PKG_NAME = lfs-bootscripts -VER = 6.3 -HOST_ARCH = all -OTHER_SRC = yes - -THISAPP = lfs-bootscripts-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = http://www.linuxfromscratch.org/lfs/downloads/6.3 -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 462bca5b42e9b7eb313857e14c366340 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - - cd $(DIR_APP) && make install - rm -fr $(CONFIG_ROOT)/sysconfig - mkdir -p $(CONFIG_ROOT)/sysconfig - mv /etc/sysconfig/* $(CONFIG_ROOT)/sysconfig/ - rm -fr /etc/sysconfig - sed -i "s,/etc/sysconfig,$(CONFIG_ROOT)/sysconfig,g" $(CONFIG_ROOT)/sysconfig/rc - echo -ne "# Begin $(CONFIG_ROOT)/sysconfig/clock\n\nUTC=1\n\n# End $(CONFIG_ROOT)/sysconfig/clock" \ - > $(CONFIG_ROOT)/sysconfig/clock - - echo "HOSTNAME=none" > $(CONFIG_ROOT)/sysconfig/network - - for script in `grep -l "/etc/sysconfig" /etc/rc.d/init.d/*`; do \ - sed -i "s,/etc/sysconfig,$(CONFIG_ROOT)/sysconfig,g" $${script}; \ - done - - for script in `find $(CONFIG_ROOT)/sysconfig/network-devices/ -type f`; do \ - sed -i "s,/etc/sysconfig,$(CONFIG_ROOT)/sysconfig,g" $${script}; \ - done - - @rm -rf $(DIR_APP) - @$(POSTBUILD) Modified: ipcop/trunk/make.sh =================================================================== --- ipcop/trunk/make.sh 2007-11-14 05:35:51 UTC (rev 704) +++ ipcop/trunk/make.sh 2007-11-14 06:30:04 UTC (rev 705) @@ -1090,7 +1090,6 @@ chroot_make udev chroot_make util-linux chroot_make vim - chroot_make lfs-bootscripts #chroot_make gdb # DEBUG -- requested by Robert Kerr for debugging. Enable only in your tree #chroot_make ed # DEBUG -- does anyone need this? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |