Deleted Added
full compact
rc.subr (231888) rc.subr (238416)
1# $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
1# $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
2# $FreeBSD: head/etc/rc.subr 231888 2012-02-18 00:46:18Z delphij $
2# $FreeBSD: head/etc/rc.subr 238416 2012-07-13 06:46:09Z kevlo $
3#
4# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
5# All rights reserved.
6#
7# This code is derived from software contributed to The NetBSD Foundation
8# by Luke Mewburn.
9#
10# Redistribution and use in source and binary forms, with or without

--- 1577 unchanged lines hidden (view full) ---

1588 devices2="${devices2} ${provider}"
1589 done
1590
1591 echo ${devices2}
1592}
1593
1594# Find scripts in local_startup directories that use the old syntax
1595#
3#
4# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
5# All rights reserved.
6#
7# This code is derived from software contributed to The NetBSD Foundation
8# by Luke Mewburn.
9#
10# Redistribution and use in source and binary forms, with or without

--- 1577 unchanged lines hidden (view full) ---

1588 devices2="${devices2} ${provider}"
1589 done
1590
1591 echo ${devices2}
1592}
1593
1594# Find scripts in local_startup directories that use the old syntax
1595#
1596find_local_scripts_old () {
1596find_local_scripts_old() {
1597 zlist=''
1598 slist=''
1599 for dir in ${local_startup}; do
1600 if [ -d "${dir}" ]; then
1601 for file in ${dir}/[0-9]*.sh; do
1602 grep '^# PROVIDE:' $file >/dev/null 2>&1 &&
1603 continue
1604 zlist="$zlist $file"
1605 done
1606 for file in ${dir}/[!0-9]*.sh; do
1607 grep '^# PROVIDE:' $file >/dev/null 2>&1 &&
1608 continue
1609 slist="$slist $file"
1610 done
1611 fi
1612 done
1613}
1614
1597 zlist=''
1598 slist=''
1599 for dir in ${local_startup}; do
1600 if [ -d "${dir}" ]; then
1601 for file in ${dir}/[0-9]*.sh; do
1602 grep '^# PROVIDE:' $file >/dev/null 2>&1 &&
1603 continue
1604 zlist="$zlist $file"
1605 done
1606 for file in ${dir}/[!0-9]*.sh; do
1607 grep '^# PROVIDE:' $file >/dev/null 2>&1 &&
1608 continue
1609 slist="$slist $file"
1610 done
1611 fi
1612 done
1613}
1614
1615find_local_scripts_new () {
1615find_local_scripts_new() {
1616 local_rc=''
1617 for dir in ${local_startup}; do
1618 if [ -d "${dir}" ]; then
1619 for file in `grep -l '^# PROVIDE:' ${dir}/* 2>/dev/null`; do
1620 case "$file" in
1621 *.sample) ;;
1622 *) if [ -x "$file" ]; then
1623 local_rc="${local_rc} ${file}"

--- 120 unchanged lines hidden ---
1616 local_rc=''
1617 for dir in ${local_startup}; do
1618 if [ -d "${dir}" ]; then
1619 for file in `grep -l '^# PROVIDE:' ${dir}/* 2>/dev/null`; do
1620 case "$file" in
1621 *.sample) ;;
1622 *) if [ -x "$file" ]; then
1623 local_rc="${local_rc} ${file}"

--- 120 unchanged lines hidden ---