View | Details | Raw Unified | Return to bug 343844
Collapse All | Expand All

(-)/etc/init.d/network (-9 / +21 lines)
Lines 430-439 Link Here
430
# PHYSICAL_IFACES  are interfaces to present physical devices, they will be
430
# PHYSICAL_IFACES  are interfaces to present physical devices, they will be
431
#                  derived from AVAILABLE_IFACES
431
#                  derived from AVAILABLE_IFACES
432
#
432
#
433
# BONDING_IFACES   are bonding interfaces derived from ifcfg-* files
434
#
433
# DIALUP_IFACES    are modemX, dslX, etc., they are derived from ifcfg-* files
435
# DIALUP_IFACES    are modemX, dslX, etc., they are derived from ifcfg-* files
434
#
436
#
435
# TUNNEL_IFACES    are interfaces that do not fit into PHYSICAL and DIALUP and
437
# TUNNEL_IFACES    are interfaces that do not fit into PHYSICAL, DIALUP, BRIDGE
436
#                  are as well derived from ifcfg-* files
438
#                  or BONDING and are as well derived from ifcfg-* files
439
#
440
# BRIDGE_IFACES    are bridge interfaces derived from ifcfg-* files
437
#
441
#
438
#    PHYSICAL, DIALUP and TUNNEL are mutually exclusive. Their union contains
442
#    PHYSICAL, DIALUP and TUNNEL are mutually exclusive. Their union contains
439
#    AVAILABLE and MANDATORY and all of them have to be set up when starting
443
#    AVAILABLE and MANDATORY and all of them have to be set up when starting
Lines 448-459 Link Here
448
		lo|eth|tr|wlan|irda|ip6tnl|mip6mnha)
452
		lo|eth|tr|wlan|irda|ip6tnl|mip6mnha)
449
			continue
453
			continue
450
			;;
454
			;;
455
		bond)
456
			BONDING_IFACES="$BONDING_IFACES $b"
457
			;;
451
		*ppp|dsl|modem|isdn)
458
		*ppp|dsl|modem|isdn)
452
			DIALUP_IFACES="$DIALUP_IFACES $b"
459
			DIALUP_IFACES="$DIALUP_IFACES $b"
453
			;;
460
			;;
454
		vlan|bond|bridge|ipip|sit|gre)
461
		vlan|ipip|sit|gre)
455
			TUNNEL_IFACES="$TUNNEL_IFACES $b"
462
			TUNNEL_IFACES="$TUNNEL_IFACES $b"
456
			;;
463
			;;
464
		bridge)
465
			BRIDGE_IFACES="$BRIDGE_IFACES $b"
466
			;;
457
		*)
467
		*)
458
			err_mesg "$b has unknown interface type. Please file a bug report."
468
			err_mesg "$b has unknown interface type. Please file a bug report."
459
			;;
469
			;;
Lines 482-488 Link Here
482
			continue
492
			continue
483
			;;
493
			;;
484
	esac
494
	esac
485
	for b in $DIALUP_IFACES $TUNNEL_IFACES; do
495
	for b in $BONDING_IFACES $DIALUP_IFACES $TUNNEL_IFACES $BRIDGE_IFACES; do
486
		if [ "$a" = "$b" ] ; then
496
		if [ "$a" = "$b" ] ; then
487
			NOT_PHYSICAL_IFACES="$NOT_PHYSICAL_IFACES $a"
497
			NOT_PHYSICAL_IFACES="$NOT_PHYSICAL_IFACES $a"
488
			continue 2
498
			continue 2
Lines 523-533 Link Here
523
				continue 2
533
				continue 2
524
			fi
534
			fi
525
		done
535
		done
526
		for d in $TUNNEL_IFACES; do
536
		for d in $BONDING_IFACES $TUNNEL_IFACES $BRIDGE_IFACES; do
527
			if [ "$b" = "$d" ] ; then
537
			if [ "$b" = "$d" ] ; then
528
				b="`get_slaves $b`"
538
				b="`get_slaves $b`"
529
				test $? = 0 || continue 2
539
				test $? = 0 || continue 2
530
				TUNNEL_SLAVES="$TUNNEL_SLAVES $b"
540
				SLAVE_IFACES="$SLAVE_IFACES $b"
531
				continue 2
541
				continue 2
532
			fi
542
			fi
533
		done
543
		done
Lines 540-546 Link Here
540
		     "/etc/sysconfig/network/config"
550
		     "/etc/sysconfig/network/config"
541
	fi
551
	fi
542
fi
552
fi
543
MANDATORY_DEVICES="$MANDATORY_DEVICES __NSC__ $TUNNEL_SLAVES"
553
MANDATORY_DEVICES="$MANDATORY_DEVICES __NSC__ $SLAVE_IFACES"
544
# Check for mandatory devices only when booting
554
# Check for mandatory devices only when booting
545
test "$MODE" = onboot || MANDATORY_DEVICES=""
555
test "$MODE" = onboot || MANDATORY_DEVICES=""
546
556
Lines 548-555 Link Here
548
debug "INTERFACE   = $INTERFACE"
558
debug "INTERFACE   = $INTERFACE"
549
debug "AVAILABLE_IFACES = $AVAILABLE_IFACES"
559
debug "AVAILABLE_IFACES = $AVAILABLE_IFACES"
550
debug "PHYSICAL_IFACES  = $PHYSICAL_IFACES"
560
debug "PHYSICAL_IFACES  = $PHYSICAL_IFACES"
561
debug "BONDING_IFACES   = $BONDING_IFACES"
551
debug "DIALUP_IFACES    = $DIALUP_IFACES"
562
debug "DIALUP_IFACES    = $DIALUP_IFACES"
552
debug "TUNNEL_IFACES    = $TUNNEL_IFACES"
563
debug "TUNNEL_IFACES    = $TUNNEL_IFACES"
564
debug "BRIDGE_IFACES    = $BRIDGE_IFACES"
553
debug "MANDATORY_DEVICES = $MANDATORY_DEVICES"
565
debug "MANDATORY_DEVICES = $MANDATORY_DEVICES"
554
debug "SKIP             = $SKIP"
566
debug "SKIP             = $SKIP"
555
567
Lines 743-749 Link Here
743
755
744
756
745
		if [ -z "$INTERFACE" ] ; then
757
		if [ -z "$INTERFACE" ] ; then
746
			for IFACE in $DIALUP_IFACES $TUNNEL_IFACES ; do
758
			for IFACE in $BONDING_IFACES $DIALUP_IFACES $TUNNEL_IFACES $BRIDGE_IFACES ; do
747
				$FAKE ifup $CONFIG $IFACE -o rc $MODE
759
				$FAKE ifup $CONFIG $IFACE -o rc $MODE
748
				RET=$?
760
				RET=$?
749
				debug && printf "    %-9s returned %s\n" $IFACE $RET
761
				debug && printf "    %-9s returned %s\n" $IFACE $RET
Lines 881-887 Link Here
881
 	 		done
893
 	 		done
882
			debug getting MANDATORY_IFACES: FAILED=$FAILED
894
			debug getting MANDATORY_IFACES: FAILED=$FAILED
883
 	 
895
 	 
884
 	 		for IFACE in $AVAILABLE_IFACES $DIALUP_IFACES $TUNNEL_IFACES; do
896
 	 		for IFACE in $AVAILABLE_IFACES $BONDING_IFACES $DIALUP_IFACES $TUNNEL_IFACES $BRIDGE_IFACES ; do
885
 	 			for MI in $MANDATORY_IFACES $TOCHECK_IFACES; do
897
 	 			for MI in $MANDATORY_IFACES $TOCHECK_IFACES; do
886
 	 				test "$IFACE" = "$MI" && continue 2
898
 	 				test "$IFACE" = "$MI" && continue 2
887
 	 			done
899
 	 			done

Return to bug 343844