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

(-)functions-fw_bad (-9 / +9 lines)
Lines 263-271 Link Here
263
    cd "$(profiled_filename $MYIFACEDIR/fw/$CFW_TYPE)"
263
    cd "$(profiled_filename $MYIFACEDIR/fw/$CFW_TYPE)"
264
    # Load modules
264
    # Load modules
265
    if [ -f "modules" ] && [ -s "modules" ]; then
265
    if [ -f "modules" ] && [ -s "modules" ]; then
266
	while read MODULE; do
266
	while read MODULE args; do
267
	    print_message -e "\tLoading module $MODULE"
267
	    print_message -e "\tLoading module $MODULE"
268
	    $MODPROBE "$MODULE" || print_error "Can't load module $MODULE"
268
	    $MODPROBE "$MODULE" $args || print_error "Can't load module $MODULE"
269
	done < <(egrep "^[^#]" modules)
269
	done < <(egrep "^[^#]" modules)
270
    fi
270
    fi
271
    # Create user chains
271
    # Create user chains
Lines 379-385 Link Here
379
    done
379
    done
380
    # Unload modules
380
    # Unload modules
381
    if [ -f "modules" ] && [ -s "modules" ]; then
381
    if [ -f "modules" ] && [ -s "modules" ]; then
382
	while read MODULE; do
382
	while read MODULE args; do
383
	    print_message -e "\tUnloading module $MODULE"
383
	    print_message -e "\tUnloading module $MODULE"
384
	    $MODPROBE -r "$MODULE" || print_error "Can't unload module $MODULE"
384
	    $MODPROBE -r "$MODULE" || print_error "Can't unload module $MODULE"
385
	done < <(tac modules|egrep "^[^#]")
385
	done < <(tac modules|egrep "^[^#]")
Lines 662-670 Link Here
662
    cd "$(profiled_filename $MYIFACEDIR/fw/$CFW_TYPE)"
662
    cd "$(profiled_filename $MYIFACEDIR/fw/$CFW_TYPE)"
663
    # Load modules
663
    # Load modules
664
    if [ -f "modules" ] && [ -s "modules" ]; then
664
    if [ -f "modules" ] && [ -s "modules" ]; then
665
	while read MODULE; do
665
	while read MODULE args; do
666
	    print_message -e "\tLoading module $MODULE"
666
	    print_message -e "\tLoading module $MODULE"
667
	    $MODPROBE "$MODULE" || print_error "Can't load module $MODULE"
667
	    $MODPROBE "$MODULE" $args || print_error "Can't load module $MODULE"
668
	done < <(egrep "^[^#]" modules)
668
	done < <(egrep "^[^#]" modules)
669
    fi
669
    fi
670
    # Create user chains
670
    # Create user chains
Lines 778-784 Link Here
778
    done
778
    done
779
    # Unload modules
779
    # Unload modules
780
    if [ -f "modules" ] && [ -s "modules" ]; then
780
    if [ -f "modules" ] && [ -s "modules" ]; then
781
	while read MODULE; do
781
	while read MODULE args; do
782
	    print_message -e "\tUnloading module $MODULE"
782
	    print_message -e "\tUnloading module $MODULE"
783
	    $MODPROBE -r "$MODULE" || print_error "Can't unload module $MODULE"
783
	    $MODPROBE -r "$MODULE" || print_error "Can't unload module $MODULE"
784
	done < <(tac modules|egrep "^[^#]")
784
	done < <(tac modules|egrep "^[^#]")
Lines 1015-1023 Link Here
1015
    cd "$(profiled_filename $MYIFACEDIR/fw/$CFW_TYPE)"
1015
    cd "$(profiled_filename $MYIFACEDIR/fw/$CFW_TYPE)"
1016
    # Load modules
1016
    # Load modules
1017
    if [ -f "modules" ] && [ -s "modules" ]; then
1017
    if [ -f "modules" ] && [ -s "modules" ]; then
1018
	while read MODULE; do
1018
	while read MODULE args ; do
1019
	    print_message -e "\tLoading module $MODULE"
1019
	    print_message -e "\tLoading module $MODULE"
1020
	    $MODPROBE "$MODULE" || print_error "Can't load module $MODULE"
1020
	    $MODPROBE "$MODULE" $args || print_error "Can't load module $MODULE"
1021
	done < <(egrep "^[^#]" modules)
1021
	done < <(egrep "^[^#]" modules)
1022
    fi
1022
    fi
1023
    # Create user chains
1023
    # Create user chains
Lines 1131-1137 Link Here
1131
    done
1131
    done
1132
    # Unload modules
1132
    # Unload modules
1133
    if [ -f "modules" ] && [ -s "modules" ]; then
1133
    if [ -f "modules" ] && [ -s "modules" ]; then
1134
	while read MODULE; do
1134
	while read MODULE args; do
1135
	    print_message -e "\tUnloading module $MODULE"
1135
	    print_message -e "\tUnloading module $MODULE"
1136
	    $MODPROBE -r "$MODULE" || print_error "Can't unload module $MODULE"
1136
	    $MODPROBE -r "$MODULE" || print_error "Can't unload module $MODULE"
1137
	done < <(tac modules|egrep "^[^#]")
1137
	done < <(tac modules|egrep "^[^#]")

Return to bug 19192