cvs commit: LFS/bootscripts/blfs/sysconfig/network-devices/services dhcpcd ipx

nathan at linuxfromscratch.org nathan at linuxfromscratch.org
Tue Mar 23 10:38:45 PST 2004


nathan      04/03/23 11:38:45

  Modified:    bootscripts CHANGELOG Makefile
               bootscripts/blfs/sysconfig/network-devices/services dhcpcd
                        ipx
  Log:
  Applied most of DJ's patch.  [not including firewall at this time]
  
  Revision  Changes    Path
  1.35      +8 -0      LFS/bootscripts/CHANGELOG
  
  Index: CHANGELOG
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/CHANGELOG,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- CHANGELOG	20 Mar 2004 06:01:09 -0000	1.34
  +++ CHANGELOG	23 Mar 2004 18:38:45 -0000	1.35
  @@ -1,3 +1,11 @@
  +n/a - March 20, 2004
  +	* Added create-service-dir target and removed from create-dirs
  +	* Changed service script install targets to use
  +	  create-service-dir
  +	* Added check for dhcpcd service script for stale pid file 
  +	  Suggested by Jeremy
  +	* Added ifconfig to ipx service script for hosting device not up
  +
   n/a - March 19, 2004
   
   	* Added support for ETCDIR, and DESTDIR in the Makefile,
  
  
  
  1.16      +7 -5      LFS/bootscripts/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/Makefile,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Makefile	20 Mar 2004 06:38:21 -0000	1.15
  +++ Makefile	23 Mar 2004 18:38:45 -0000	1.16
  @@ -6,9 +6,11 @@
   create-dirs:
   	install -d -m 755 ${EXTDIR}/rc.d/rc{0,1,2,3,4,5,6,sysinit}.d
   	install -d -m 755 ${EXTDIR}/rc.d/init.d
  +
  +create-service-dir:
   	install -d -m 755 ${EXTDIR}/sysconfig/network-devices/services
   
  -install: create-dirs
  +install: create-dirs create-service-dir
   	install -m 754 lfs/init.d/checkfs      ${EXTDIR}/rc.d/init.d/
   	install -m 754 lfs/init.d/cleanfs      ${EXTDIR}/rc.d/init.d/
   	install -m 644 lfs/init.d/functions    ${EXTDIR}/rc.d/init.d/
  @@ -63,16 +65,16 @@
   	install -m 754 lfs/sysconfig/network-devices/services/static ${EXTDIR}/sysconfig/network-devices/services
   
   
  -install-service-dhclient: create-dirs
  +install-service-dhclient: create-service-dir
   	install -m 754 blfs/sysconfig/network-devices/services/dhclient ${EXTDIR}/sysconfig/network-devices/services
   
  -install-service-dhcpcd: create-dirs
  +install-service-dhcpcd: create-service-dir
   	install -m 754 blfs/sysconfig/network-devices/services/dhcpcd   ${EXTDIR}/sysconfig/network-devices/services
   
  -install-service-ipx: create-dirs
  +install-service-ipx: create-service-dir
   	install -m 754 blfs/sysconfig/network-devices/services/ipx      ${EXTDIR}/sysconfig/network-devices/services
   
  -install-service-pppoe: create-dirs
  +install-service-pppoe: create-service-dir
   	install -m 754 blfs/sysconfig/network-devices/services/pppoe    ${EXTDIR}/sysconfig/network-devices/services
   
   
  
  
  
  1.2       +12 -0     LFS/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd
  
  Index: dhcpcd
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dhcpcd	20 Mar 2004 06:01:09 -0000	1.1
  +++ dhcpcd	23 Mar 2004 18:38:45 -0000	1.2
  @@ -12,6 +12,18 @@
   case "$2" in
           up)
                   echo "Bringing up the $1 interface (dhcpcd)..."
  +                # Test to see if there is a stale pid file
  +                if [ -f /var/run/dhcpcd-$1.pid ]
  +                then
  +                    ps $(cat /var/run/dhcpcd-$1.pid) | grep dhcpcd > /dev/null
  +                    if [ $? != 0 ]
  +                    then
  +                        rm -f /var/run/dhcpcd-$1.pid > /dev/null
  +                    else
  +                        print_status warning running
  +                        exit 2
  +                    fi
  +                fi
                   /sbin/dhcpcd $1 $DHCP_START
                   evaluate_retval
           ;;
  
  
  
  1.2       +1 -0      LFS/bootscripts/blfs/sysconfig/network-devices/services/ipx
  
  Index: ipx
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/blfs/sysconfig/network-devices/services/ipx,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ipx	20 Mar 2004 06:01:09 -0000	1.1
  +++ ipx	23 Mar 2004 18:38:45 -0000	1.2
  @@ -12,6 +12,7 @@
   case $2 in
           up)
                   echo "Setting up the IPX protocol on $IPXDEV"
  +                /sbin/ifconfig $IPXDEV up > /dev/null
                   /bin/ipx_interface add $IPXDEV $FRAME &&
                   /bin/ipx_configure --auto_interface=on --auto_primary=on
                   evaluate_retval
  
  
  



More information about the lfs-book mailing list