+++ /dev/null
---- rc-scripts-0.4.0.26/sysconfig/Makefile.am 2005-08-11 19:03:52.000000000 +0300
-+++ rc-scripts-0.4.0.26.noinst/sysconfig/Makefile.am 2006-03-24 23:19:38.000000000 +0200
-@@ -7,7 +7,6 @@
- sysconfig_DATA = \
- clock \
- init-colors \
-- init-colors.gentoo \
- hwprof \
- system \
- network \
-@@ -17,4 +16,7 @@
- i18n \
- timezone
-
--EXTRA_DIST = $(sysconfig_DATA)
-+noinst_DATA = \
-+ init-colors.gentoo
-+
-+EXTRA_DIST = $(sysconfig_DATA) $(noinst_DATA)
---- rc-scripts-0.4.0.26/sysconfig/interfaces/Makefile.am 2006-01-19 10:51:36.000000000 +0200
-+++ rc-scripts-0.4.0.26.noinst/sysconfig/interfaces/Makefile.am 2006-03-24 23:16:10.000000000 +0200
-@@ -4,10 +4,11 @@
-
- interfacesdir = @sysconfigdir@/interfaces
-
--interfaces_DATA = \
-+interfaces_DATA = ifcfg-eth0
-+
-+noinst_DATA = \
- ifcfg-br0 \
- ifcfg-description \
-- ifcfg-eth0 \
- ifcfg-eth0.1 \
- ifcfg-irda0 \
- ifcfg-irlan0 \
-@@ -24,4 +25,4 @@
- tnlcfg-icm
-
-
--EXTRA_DIST = $(interfaces_DATA)
-+EXTRA_DIST = $(interfaces_DATA) $(noinst_DATA)
---- rc-scripts-0.4.0.26/sysconfig/interfaces/data/Makefile.am 2003-10-28 03:11:09.000000000 +0200
-+++ rc-scripts-0.4.0.26.noinst/sysconfig/interfaces/data/Makefile.am 2006-03-24 23:17:17.000000000 +0200
-@@ -2,10 +2,12 @@
-
- interfacesdatadir = @sysconfigdir@/interfaces/data
-
--interfacesdata_DATA = \
-+interfacesdata_DATA =
-+
-+noinst_DATA = \
- chat-ppp0.callback \
- chat-ppp0.leased1 \
- chat-ppp0.tpsa \
- chat-ppp0.gprs-plusgsm
-
--EXTRA_DIST = $(interfacesdata_DATA)
-+EXTRA_DIST = $(interfacesdata_DATA) $(noinst_DATA)
-diff -ur rc-scripts-0.4.0.26/sysconfig/interfaces/down.d/all/Makefile.am rc-scripts-0.4.0.26.noinst/sysconfig/interfaces/down.d/all/Makefile.am
---- rc-scripts-0.4.0.26/sysconfig/interfaces/down.d/all/Makefile.am 2003-10-28 03:11:06.000000000 +0200
-+++ rc-scripts-0.4.0.26.noinst/sysconfig/interfaces/down.d/all/Makefile.am 2006-03-24 23:17:56.000000000 +0200
-@@ -2,6 +2,7 @@
-
- alldowndir= @downdir@/all
-
--alldown_SCRIPTS = thetouch
-+alldown_SCRIPTS =
-+noinst_SCRIPTS = thetouch
-
--EXTRA_DIST = $(alldown_SCRIPTS)
-+EXTRA_DIST = $(alldown_SCRIPTS) $(noinst_SCRIPTS)
---- rc-scripts-0.4.0.26/doc/Makefile.am~ 2005-01-24 16:09:29.000000000 +0200
-+++ rc-scripts-0.4.0.26/doc/Makefile.am 2006-03-24 23:44:17.000000000 +0200
-@@ -2,9 +2,10 @@
-
- docdir = @docdir@
-
--doc_DATA = \
-+doc_DATA =
-+noinst_DATA = \
- net-scripts.txt \
- sysconfig.txt \
- sysvinitfiles
-
--EXTRA_DIST = $(doc_DATA)
-+EXTRA_DIST = $(doc_DATA) $(noinst_DATA)
---- rc-scripts-0.4.0.26/sysconfig/hwprofiles/Makefile.am~ 2003-10-28 03:11:05.000000000 +0200
-+++ rc-scripts-0.4.0.26/sysconfig/hwprofiles/Makefile.am 2006-03-24 23:46:17.000000000 +0200
-@@ -2,7 +2,8 @@
-
- hwprofilesdir = @sysconfigdir@/hwprofiles
-
--hwprofiles_DATA = \
-- files
-+hwprofiles_DATA =
-+noinst_DATA = \
-+ files
-
--EXTRA_DIST = $(hwprofiles_DATA)
-+EXTRA_DIST = $(hwprofiles_DATA) $(noinst_DATA)
---- rc-scripts-0.4.0.26/sysconfig/interfaces/up.d/all/Makefile.am~ 2003-10-28 03:11:08.000000000 +0200
-+++ rc-scripts-0.4.0.26/sysconfig/interfaces/up.d/all/Makefile.am 2006-03-24 23:48:56.000000000 +0200
-@@ -2,6 +2,7 @@
-
- allupdir = @updir@/all
-
--allup_SCRIPTS = thetouch
-+allup_SCRIPTS =
-+noinst_SCRIPTS = thetouch
-
--EXTRA_DIST = $(allup_SCRIPTS)
-+EXTRA_DIST = $(allup_SCRIPTS) $(noinst_SCRIPTS)
+++ /dev/null
-Index: rc.d/init.d/network
-===================================================================
---- rc.d/init.d/network (revision 7128)
-+++ rc.d/init.d/network (revision 7131)
-@@ -119,74 +119,98 @@
- set_down_loopback
- }
-
--# find all the interfaces besides loopback.
--# ignore aliases, alternative configurations, and editor backup files
--if [ -n "$(grep "^BOOTPRIO=" /etc/sysconfig/interfaces/ifcfg* 2> /dev/null)" ]; then
-- interfaces_boot=$(( \
-- . /etc/rc.d/init.d/functions; \
-- cd /etc/sysconfig/interfaces; \
-- egrep 'BOOTPRIO' ifcfg* | sort -t= -n -k2,2 | \
-- awk ' { gsub(/:BOOTPRIO.*/,NIL); print $0 } '| egrep -v 'ifcfg-lo' | \
-- for i in `cat`; do \
-- ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; \
-- is_yes "$ONBOOT" && echo "$i"; \
-- done | \
-- awk ' { gsub(/ifcfg-/,NIL); print $0 } ') 2> /dev/null)
-+# Get list of interface configs
-+# ignores editor backup files and rpm blackups
-+network_interface_configs()
-+{
-+ local match="$1"
-+ for a in /etc/sysconfig/interfaces/$match; do
-+ case "$a" in
-+ *rpmorig|*rpmnew|*rpmsave|*~|*.orig)
-+ continue
-+ ;;
-+ *)
-+ echo $a
-+ ;;
-+ esac
-+ done
-+}
-+
-+ifcfg_files="$(network_interface_configs 'ifcfg-*')"
-+
-+if [ -n "$bootprio" ]; then
-+ # find all the interfaces besides loopback.
-+ interfaces_boot=`
-+ for a in $(echo "$bootprio" | sort -t= -n -k2,2); do
-+ i="${a%:BOOTPRIO*}"
-+ case $i in
-+ *ifcfg-lo) continue ;;
-+ esac
-+ ONBOOT=""; . "$i" 2>/dev/null
-+ is_yes "$ONBOOT" && echo "${i##*/}"
-+ done
-+ `
- else
-- interfaces_boot=$((
-- . /etc/rc.d/init.d/functions; \
-- cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \
-- egrep -v '(ifcfg-lo|ifcfg-sit|ifcfg-atm|ifcfg-lec|ifcfg-nas|ifcfg-br|ifcfg-(.*)\.(.*))' | \
-- LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \
-- for i in `cat`; do \
-- ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; \
-- is_yes "$ONBOOT" && echo "$i"; \
-- done | \
-- awk ' { gsub(/ifcfg-/,NIL); print $0 } ') 2> /dev/null)
-- interfaces_vlan_boot=$((
-- . /etc/rc.d/init.d/functions; \
-- cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \
-- egrep 'ifcfg-(.*)\.(.*)' | \
-- LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \
-- for i in `cat`; do \
-- ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; \
-- is_yes "$ONBOOT" && echo "$i"; \
-- done | \
-- awk ' { gsub(/ifcfg-/,NIL); print $0 } ') 2> /dev/null)
-- interfaces_br_boot=$((
-- . /etc/rc.d/init.d/functions; \
-- cd /etc/sysconfig/interfaces && ls -1 ifcfg-br* | \
-- LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \
-- for i in `cat`; do \
-- ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; \
-- is_yes "$ONBOOT" && echo "$i"; \
-- done | \
-- awk ' { gsub(/ifcfg-/,NIL); print $0 } ') 2> /dev/null)
-- interfaces_sit_boot=$((
-- . /etc/rc.d/init.d/functions; \
-- cd /etc/sysconfig/interfaces && ls -1 ifcfg-sit* | \
-- LC_ALL=C egrep 'ifcfg-[a-z0-9]+$' | \
-- for i in `cat`; do \
-- ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; \
-- is_yes "$ONBOOT" && echo "$i"; \
-- done | \
-- awk ' { gsub(/ifcfg-/,NIL); print $0 } ') 2> /dev/null)
-+ interfaces_boot=`
-+ for i in $ifcfg_files; do
-+ case ${i##*/} in
-+ ifcfg-lo|ifcfg-sit|ifcfg-atm|ifcfg-lec|ifcfg-nas|ifcfg-br|ifcfg-*.*) continue ;;
-+ esac
-+ ONBOOT=""; . "$i" 2>/dev/null
-+ is_yes "$ONBOOT" && echo "${i##*/}"
-+ done
-+ `
-+
-+ interfaces_vlan_boot=`
-+ for i in $ifcfg_files; do
-+ case ${i##*/} in
-+ ifcfg-*.*) ;;
-+ *) continue ;;
-+ esac
-+ ONBOOT=""; . "$i" 2>/dev/null
-+ is_yes "$ONBOOT" && echo "${i##*/}"
-+ done
-+ `
-+
-+ interfaces_br_boot=`
-+ for i in $ifcfg_files; do
-+ case ${i##*/} in
-+ ifcfg-br*) ;;
-+ *) continue ;;
-+ esac
-+ ONBOOT=""; . "$i" 2>/dev/null
-+ is_yes "$ONBOOT" && echo "${i##*/}"
-+ done
-+ `
-+
-+ interfaces_sit_boot=`
-+ for i in $ifcfg_files; do
-+ case ${i##*/} in
-+ ifcfg-sit*) ;;
-+ *) continue ;;
-+ esac
-+ ONBOOT=""; . "$i" 2>/dev/null
-+ is_yes "$ONBOOT" && echo "${i##*/}"
-+ done
-+ `
- fi
--tunnels=$((cd /etc/sysconfig/interfaces && ls -1 tnlcfg-* | \
-- xargs egrep -l "ONBOOT=[^n][^o]" | \
-- LC_ALL=C egrep 'tnlcfg-[a-z0-9]+$' | \
-- awk ' { gsub(/tnlcfg-/,NIL); print $0 } ') 2> /dev/null)
-
-+tunnels=`
-+ for i in $(network_interface_configs 'tnlcfg-*'); do
-+ ONBOOT=""; . "$i" 2>/dev/null
-+ is_yes "$ONBOOT" && echo "${i##*/}"
-+ done
-+`
-+
- # See how we were called.
- case "$1" in
- start)
-- rc_splash "bootnetwork start"
--
- if is_yes "$VSERVER"; then
- touch /var/lock/subsys/network
- exit 0
- fi
-
-+ rc_splash "bootnetwork start"
- network_init
-
- for i in $interfaces_boot $interfaces_vlan_boot $interfaces_sit_boot ; do
projects / packages / rc-scripts.git / commitdiff