+++ /dev/null
---- rc-scripts-0.4.0.2/rc.d/rc.shutdown.orig 2003-10-12 15:24:49.000000000 +0200
-+++ rc-scripts-0.4.0.2/rc.d/rc.shutdown 2003-10-12 15:26:49.901497848 +0200
-@@ -29,8 +29,9 @@
- halt -w
-
- # Turn off swap, then unmount file systems.
--run_cmd "Turning off swap and accounting" swapoff -a
--[ -x /sbin/accton ] && LC_ALL=C /sbin/accton 2>&1 | grep -v "not implemented"
-+run_cmd "Turning off swap" swapoff -a
-+
-+[ -x /etc/rc.d/rc.acct ] && /etc/rc.d/rc.acct stop
-
- if [ -x /sbin/quotaoff ]; then
- run_cmd "Turning off quotas for local filesystems" /sbin/quotaoff -a
---- rc-scripts-0.4.0.2/rc.d/rc.sysinit.orig 2003-10-02 20:46:49.000000000 +0200
-+++ rc-scripts-0.4.0.2/rc.d/rc.sysinit 2003-10-12 15:27:42.869445496 +0200
-@@ -610,8 +610,8 @@
- fi
-
- # Turn on process accounting
--if [ -x /sbin/accton ] ; then
-- run_cmd "Turning on process accounting" /sbin/accton /var/log/pacct
-+if [ -x /etc/rc.d/rc.acct ]; then
-+ /etc/rc.d/rc.acct start
- fi
-
- # Set the clock if timezone definition wasn't available (eg. /usr not mounted)
---- rc-scripts-0.4.0.2/po/rc-scripts.pot.orig 2003-10-02 20:47:28.000000000 +0200
-+++ rc-scripts-0.4.0.2/po/rc-scripts.pot 2003-10-12 15:28:18.477032320 +0200
-@@ -24,7 +24,7 @@
-
- #: ../rc.d/.svn/text-base/rc.shutdown.svn-base:31
- #: ../rc.d/rc.shutdown:31
--msgid "Turning off swap and accounting"
-+msgid "Turning off swap"
- msgstr ""
-
- #: ../sysconfig/network-scripts/.svn/text-base/ifup-aliases.svn-base:14
-@@ -447,12 +447,6 @@
- msgid "(RAID Repair)# "
- msgstr ""
-
--#: ../rc.d/.svn/text-base/rc.sysinit.svn-base:613
--#: ../rc.d/rc.sysinit~:614
--#: ../rc.d/rc.sysinit:613
--msgid "Turning on process accounting"
--msgstr ""
--
- #: ../rc.d/.svn/text-base/rc.sysinit.svn-base:76
- #: ../rc.d/rc.sysinit~:76
- #: ../rc.d/rc.sysinit:76
---- rc-scripts-0.4.0.2/po/pl.po.orig 2003-10-02 20:46:49.000000000 +0200
-+++ rc-scripts-0.4.0.2/po/pl.po 2003-10-12 15:28:38.561978944 +0200
-@@ -58,8 +58,8 @@
- msgstr "Wysylanie do wszystkich procesów sygnalu KILL"
-
- #: ./rc.d/rc.shutdown:32
--msgid "Turning off swap and accounting"
--msgstr "Wylaczanie swapa i zliczania"
-+msgid "Turning off swap"
-+msgstr "Wylaczanie swapa"
-
- #: ./rc.d/rc.shutdown:36
- msgid "Turning off quotas for local filesystems"
-@@ -283,10 +283,6 @@
- msgid "Turning on quotas for local filesystems"
- msgstr "Wlaczanie quot na lokalnych systemach plików"
-
--#: ./rc.d/rc.sysinit:542
--msgid "Turning on process accounting"
--msgstr "Wlaczanie zliczania procesów"
--
- #: ./rc.d/rc.sysinit:558
- msgid "Setting %s seconds for kernel reboot after panic"
- msgstr "Restart systemu po %s sekundach od zawieszenia sie jadra"
---- rc-scripts-0.4.0.2/po/de.po.orig 2003-10-02 20:46:49.000000000 +0200
-+++ rc-scripts-0.4.0.2/po/de.po 2003-10-12 15:29:34.916411768 +0200
-@@ -125,7 +125,7 @@
-
- #: ../rc.d/rc.shutdown:32
- msgid "Turning off swap and accounting"
--msgstr "Die Auslagerung und das Protokollieren werden ausgeschaltet"
-+msgstr "Die Auslagerung wird ausgeschaltet"
-
- #: ../rc.d/rc.shutdown:42 ../rc.d/rc.sysinit:190 ../rc.d/rc.sysinit:346
- #: ../rc.d/rc.sysinit:375
+++ /dev/null
-diff -urN rc-scripts-0.3.1.org/sysconfig/Makefile.am rc-scripts-0.3.1/sysconfig/Makefile.am
---- rc-scripts-0.3.1.org/sysconfig/Makefile.am Sun Aug 11 16:03:09 2002
-+++ rc-scripts-0.3.1/sysconfig/Makefile.am Sun Aug 11 16:03:34 2002
-@@ -10,6 +10,7 @@
- network \
- static-routes \
- static-nat \
-+ static-arp \
- i18n \
- timezone
-
-diff -urN rc-scripts-0.3.1.org/sysconfig/Makefile.in rc-scripts-0.3.1/sysconfig/Makefile.in
---- rc-scripts-0.3.1.org/sysconfig/Makefile.in Sun Aug 11 16:03:09 2002
-+++ rc-scripts-0.3.1/sysconfig/Makefile.in Sun Aug 11 16:03:44 2002
-@@ -93,6 +93,7 @@
- network \
- static-routes \
- static-nat \
-+ static-arp \
- i18n \
- timezone
-
-diff -urN rc-scripts-0.3.1.org/sysconfig/network-scripts/Makefile.am rc-scripts-0.3.1/sysconfig/network-scripts/Makefile.am
---- rc-scripts-0.3.1.org/sysconfig/network-scripts/Makefile.am Sun Aug 11 16:03:09 2002
-+++ rc-scripts-0.3.1/sysconfig/network-scripts/Makefile.am Sun Aug 11 16:10:32 2002
-@@ -18,6 +18,7 @@
- ifup-aliases \
- ifup-br \
- ifup-ipx \
-+ ifup-neigh \
- ifup-plip \
- ifup-post \
- ifup-ppp \
-diff -urN rc-scripts-0.3.1.org/sysconfig/network-scripts/Makefile.in rc-scripts-0.3.1/sysconfig/network-scripts/Makefile.in
---- rc-scripts-0.3.1.org/sysconfig/network-scripts/Makefile.in Sun Aug 11 16:03:09 2002
-+++ rc-scripts-0.3.1/sysconfig/network-scripts/Makefile.in Sun Aug 11 16:10:44 2002
-@@ -101,6 +101,7 @@
- ifup-aliases \
- ifup-br \
- ifup-ipx \
-+ ifup-neigh \
- ifup-plip \
- ifup-post \
- ifup-ppp \
-diff -urN rc-scripts-0.3.1.org/sysconfig/network-scripts/ifup-neigh rc-scripts-0.3.1/sysconfig/network-scripts/ifup-neigh
---- rc-scripts-0.3.1.org/sysconfig/network-scripts/ifup-neigh Thu Jan 1 01:00:00 1970
-+++ rc-scripts-0.3.1/sysconfig/network-scripts/ifup-neigh Sun Aug 11 16:13:52 2002
-@@ -0,0 +1,46 @@
-+#!/bin/sh
-+#
-+# $Id$
-+#
-+# adds static arps for device $DEVICE
-+
-+. /etc/sysconfig/network
-+. /etc/rc.d/init.d/functions
-+. /etc/sysconfig/network-scripts/.functions
-+
-+DEV=$1
-+
-+if [ -z "$DEV" ]; then
-+ nls "Usage: %s <device name>" "ifup-neigh" >&2
-+ exit 1
-+fi
-+
-+if [ ! -f /etc/sysconfig/static-arp ]; then
-+ exit 0
-+fi
-+
-+if [ -f "/etc/sysconfig/interfaces/ifcfg-$DEV" ] ; then
-+ CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
-+else
-+ CONFIG="$DEV"
-+fi
-+
-+source_config
-+
-+# set all major variables
-+setup_ip_param
-+
-+get_ppp_device_and_pid
-+
-+# note the trailing white space character in the grep gets rid of aliases
-+egrep "^($DEVICE|any)[[:blank:]]" /etc/sysconfig/static-arp | while read iface mac ip state args; do
-+ if is_no "$IPV4_NETWORKING"; then
-+ continue
-+ fi
-+ [ -z "$state" ] && state="stale"
-+ /sbin/ip neigh replace $ip lladdr $mac nud $state dev $DEVICE
-+done
-+
-+
-+# This must be last line !
-+# vi:syntax=sh:tw=78:ts=8:sw=4
-diff -urN rc-scripts-0.3.1.org/sysconfig/network-scripts/ifup-post rc-scripts-0.3.1/sysconfig/network-scripts/ifup-post
---- rc-scripts-0.3.1.org/sysconfig/network-scripts/ifup-post Sun Aug 11 16:03:09 2002
-+++ rc-scripts-0.3.1/sysconfig/network-scripts/ifup-post Sun Aug 11 16:05:01 2002
-@@ -27,6 +27,7 @@
-
- /etc/sysconfig/network-scripts/ifup-aliases ${CONFIG}
- /etc/sysconfig/network-scripts/ifup-routes ${CONFIG}
-+/etc/sysconfig/network-scripts/ifup-neigh ${CONFIG}
-
- # don't set hostname on ppp/slip connections
- if [ -n "$NEEDHOSTNAME" -a "${DEVICETYPE}" != "ppp" -a "${DEVICETYPE}" != "slip" ]; then
-diff -urN rc-scripts-0.3.1.org/sysconfig/network-scripts/ifup-routes rc-scripts-0.3.1/sysconfig/network-scripts/ifup-routes
---- rc-scripts-0.3.1.org/sysconfig/network-scripts/ifup-routes Sun Aug 11 16:03:09 2002
-+++ rc-scripts-0.3.1/sysconfig/network-scripts/ifup-routes Sun Aug 11 16:04:28 2002
-@@ -33,7 +33,7 @@
- get_ppp_device_and_pid
-
- # note the trailing white space character in the grep gets rid of aliases
--grep "^$DEVICE[[:blank:]]" /etc/sysconfig/static-routes | while read device args; do
-+egrep "^($DEVICE|any)[[:blank:]]" /etc/sysconfig/static-routes | while read device args; do
- if (echo $args | grep -q ":") then
- if is_no "$IPV6_NETWORKING"; then
- continue
-diff -urN rc-scripts-0.3.1.org/sysconfig/static-arp rc-scripts-0.3.1/sysconfig/static-arp
---- rc-scripts-0.3.1.org/sysconfig/static-arp Thu Jan 1 01:00:00 1970
-+++ rc-scripts-0.3.1/sysconfig/static-arp Sun Aug 11 16:00:09 2002
-@@ -0,0 +1,3 @@
-+# dev mac ip state opts
-+# eth0 00:80:48:12:c2:3c 192.168.10.10 permanent
-+#eth1 00:80:48:12:c2:44 12.12.12.12 permanent
+++ /dev/null
---- sysconfig/interfaces/data/chat-ppp0.tpsa.org Mon Feb 5 18:57:58 2001
-+++ sysconfig/interfaces/data/chat-ppp0.tpsa Sun Apr 21 12:22:06 2002
-@@ -1,5 +1,5 @@
- # (c) 1999 Grzegorz Stanislawski <stangrze@open.net.pl>
--# $Id$
-+# $Id$
- # Script for dialing in to Public Internet Access by TPSA (0202122)
-
- ABORT BUSY
-@@ -10,7 +10,6 @@
- OK $INITSTRING
- OK atdt$PHONE
- CONNECT \\c
-+ppp\\r \\c
- ame: $USER
- ord: $PASSWORD
--ppp: ''
--starting: ''
+++ /dev/null
---- ./rc.d/init.d/functions.orig Tue Oct 29 18:08:50 2002
-+++ ./rc.d/init.d/functions Tue Oct 29 18:02:56 2002
-@@ -9,6 +9,7 @@
- # Marek Obuchowicz <elephant@pld.org.pl>
- # Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
- # Micha³ Kochanowicz <mkochano@pld.org.pl>
-+# Mariusz Mazur <mmazur@pld.org.pl>
-
- # First set up a default search path.
- export PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
-@@ -388,6 +389,28 @@
- fi
- }
-
-+# A function to filter out pids that are not in current chroot.
-+
-+filterchrooted()
-+{
-+ # We don't test syntax since we can get zero parameters
-+
-+ # Main loop.
-+ while [ $# -gt 0 ]; do
-+ rewt=$(resolvesymlink /proc/$1/root)
-+ if [ -n "$rewt" ]; then
-+ if [ "$rewt" = "/" ] || \
-+ [ "$rewt" = "/usr/share/empty" ] || \
-+ [ "$rewt" = "$CHROOT_TO_DIR" ]; then
-+ filteredpids="$filteredpids $1"
-+ fi
-+ fi
-+ shift
-+ done
-+
-+ echo $filteredpids
-+}
-+
- # A function to find the pid of a program.
- pidofproc()
- {
-@@ -401,6 +425,7 @@
- # First try "/var/run/*.pid" files
- if [ -f /var/run/$1.pid ] ; then
- pid=$(head -1 /var/run/$1.pid)
-+ pid=$(filterchrooted $pid)
- if [ -n "$pid" ] ; then
- echo $pid
- return 0
-@@ -409,16 +434,17 @@
-
- # Next try "pidof"
- pid=$(pidof -o $$ -o $PPID -o %PPID -x $1)
-+ pid=$(filterchrooted $pid)
- if [ -n "$pid" ] ; then
- echo $pid
- return 0
- fi
-
- # Finally try to extract it from ps
-- ps ax | awk 'BEGIN { prog=ARGV[1]; ARGC=1 }
-+ filterchrooted `ps ax | awk 'BEGIN { prog=ARGV[1]; ARGC=1 }
- { if ((prog == $5) || (("(" prog ")") == $5) ||
- (("[" prog "]") == $5) ||
-- ((prog ":") == $5)) { print $1 ; exit 0 } }' $1
-+ ((prog ":") == $5)) { print $1 ; exit 0 } }' $1`
- }
-
- status()
-@@ -434,6 +460,7 @@
-
- # First try "pidof"
- pid=$(pidof -o $$ -o $PPID -o %PPID -x $daemon)
-+ pid=$(filterchrooted $pid)
- if [ -n "$pid" ] ; then
- nls "%s (pid %s) is running..." "$daemon" "$pid"
- return 0
-@@ -442,6 +469,7 @@
- { if ((prog == $5) || (("(" prog ")") == $5) ||
- (("[" prog "]") == $5) ||
- ((prog ":") == $5)) { print $1 ; exit 0 } }' $1`
-+ pid=$(filterchrooted $pid)
- if [ "$pid" != "" ] ; then
- nls "%s (pid %s) is running..." "$daemon" "$pid"
- return 0
-@@ -451,6 +479,7 @@
- # Next try "/var/run/*.pid" files
- if [ -f /var/run/$daemon.pid ] ; then
- pid=$(head -1 /var/run/$1.pid)
-+ pid=$(filterchrooted $pid)
- if [ -n "$pid" ] ; then
- nls "%s dead but pid file exists" "$1"
- return 1
+++ /dev/null
-diff -urN rc-scripts-0.3.1.org/rc.d/rc.sysinit rc-scripts-0.3.1/rc.d/rc.sysinit
---- rc-scripts-0.3.1.org/rc.d/rc.sysinit 2003-10-16 22:52:57.000000000 +0200
-+++ rc-scripts-0.3.1/rc.d/rc.sysinit 2003-10-16 22:59:09.000000000 +0200
-@@ -356,8 +356,10 @@
- fi
-
- # Find and activate volume groups
--if [ -e /etc/lvmtab -a -x /sbin/vgscan -a -x /sbin/vgchange ]; then
-+if [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
- modprobe -s lvm-mod >/dev/null 2>&1
-+ # device mapper (2.5+ and patched 2.4)
-+ modprobe -s dm-mod >/dev/null 2>&1
- run_cmd "Scanning for LVM volume groups" /sbin/vgscan && \
- run_cmd "Activating LVM volume groups" /sbin/vgchange -a y
- fi
+++ /dev/null
-diff -urN rc-scripts-0.4.0.4.org/rc.d/rc.sysinit rc-scripts-0.4.0.4/rc.d/rc.sysinit
---- rc-scripts-0.4.0.4.org/rc.d/rc.sysinit 2003-10-31 02:14:46.000000000 +0100
-+++ rc-scripts-0.4.0.4/rc.d/rc.sysinit 2003-10-31 02:15:07.000000000 +0100
-@@ -379,7 +379,7 @@
- fi
-
- # Load firewire devices
--if ! grep -iq "nofirewire" ; then
-+if ! grep -iq "nofirewire" /proc/cmdline 2>/dev/null ; then
- aliases=$(/sbin/modprobe -c | awk '/^alias ieee1394-controller/ { print $3 }')
- if [ -n "$aliases" -a "$aliases" != "off" ] ; then
- for alias in $aliases ; do
+++ /dev/null
---- ./rc.d/init.d/network.org Fri Nov 9 19:34:41 2001
-+++ ./rc.d/init.d/network Tue Feb 12 15:31:45 2002
-@@ -76,7 +76,7 @@
- else
- IPXAUTOPRIMARY="off"
- fi
-- /usr/bin/ipx_configure --auto_primary=$IPXAUTOPRIMARY
-+ /sbin/ipx_configure --auto_primary=$IPXAUTOPRIMARY
- fi
- if [ -n $IPXAUTOFRAME ] ; then
- if is_yes "$IPXAUTOFRAME"; then
-@@ -84,10 +84,10 @@
- else
- IPXAUTOFRAME="off"
- fi
-- /usr/bin/ipx_configure --auto_interface=$IPXAUTOFRAME
-+ /sbin/ipx_configure --auto_interface=$IPXAUTOFRAME
- fi
- if [ -n "$IPXINTERNALNETNUM" -a "$IPXINTERNALNETNUM" != "0" ]; then
-- /usr/bin/ipx_internal_net add $IPXINTERNALNETNUM $IPXINTERNALNODENUM
-+ /sbin/ipx_internal_net add $IPXINTERNALNETNUM $IPXINTERNALNODENUM
- fi
- fi
- }
-@@ -204,6 +204,11 @@
- ;;
- restart)
- $0 stop
-+ show "Waiting 5 seconds for interfaces shutdown"
-+ busy
-+ sleep 5
-+ deltext
-+ ok
- $0 start
- ;;
- *)
---- ./sysconfig/network-scripts/ifup-ipx.org Wed May 16 15:12:07 2001
-+++ ./sysconfig/network-scripts/ifup-ipx Tue Feb 12 15:29:18 2002
-@@ -19,8 +19,8 @@
- exit 0
- fi
-
--if [ ! -x /usr/bin/ipx_interface ] ; then
-- nls "%s is missing. Can't continue." "/usr/bin/ipx_interface"
-+if [ ! -x /sbin/ipx_interface ] ; then
-+ nls "%s is missing. Can't continue." "/sbin/ipx_interface"
- exit 1
- fi
-
-@@ -44,7 +44,7 @@
- esac
-
- ip link set $DEVICE up
-- /usr/bin/ipx_interface add $primary $DEVICE $frametype \
-+ /sbin/ipx_interface add $primary $DEVICE $frametype \
- $(eval echo $(echo \$`echo IPXNETNUM_$framename`))
- ;;
- esac
+++ /dev/null
---- rc-scripts-0.4.0.2/sysconfig/network-scripts/functions.network.orig 2003-10-02 20:46:49.000000000 +0200
-+++ rc-scripts-0.4.0.2/sysconfig/network-scripts/functions.network 2003-10-12 15:36:26.392857840 +0200
-@@ -64,7 +64,7 @@
- fi
- }
-
--# PLD GNU/Linux network functions
-+# PLD Linux Distribution network functions
- # Copyright (C) 1999, 2000 Arkadiusz Mi¶kiewicz <misiek@pld-linux.org>
-
- # Setup Network Address Translation (NAT)
+++ /dev/null
-diff -durN -x '*~' rc-scripts-0.4.0.5.orig/src/Makefile.am rc-scripts-0.4.0.5/src/Makefile.am
---- rc-scripts-0.4.0.5.orig/src/Makefile.am 2003-12-07 16:58:12.000000000 +0100
-+++ rc-scripts-0.4.0.5/src/Makefile.am 2004-12-19 14:51:54.862899648 +0100
-@@ -2,6 +2,8 @@
-
- DEFS = @DEFS@ -D_GNU_SOURCE=1
-
-+glibdir = /usr/lib
-+
- sysconf_DATA = \
- initlog.conf
-
-@@ -53,7 +55,7 @@
- getkey_LDADD = -lpopt
-
- ppp_watch_SOURCES = ppp-watch.c shvar.c shvar.h
--ppp_watch_LDADD = /usr/lib/libglib.a
-+ppp_watch_LDADD = $(glibdir)/libglib.a
- INCLUDES = `glib-config --cflags`
-
- consoletype_SOURCES = consoletype.c
+++ /dev/null
-diff -urN rc-scripts-0.3.1.org/rc.d/rc.sysinit rc-scripts-0.3.1/rc.d/rc.sysinit
---- rc-scripts-0.3.1.org/rc.d/rc.sysinit 2004-01-17 00:13:42.164355620 +0100
-+++ rc-scripts-0.3.1/rc.d/rc.sysinit 2004-01-17 00:15:53.224091932 +0100
-@@ -375,11 +375,15 @@
- show "Starting up RAID device %s" $RAIDDEV
- busy
- if [ -z "$RAIDSTAT" ]; then
-- # Try raidstart first...if that fails then
-+ # Try mdadm, raidstart first...if that fails then
- # fall back to raid0run and if that fails too
- # fall back to raidadd, raidrun.
- RESULT=1
-- if [ -x /sbin/raidstart ]; then
-+ if [ -x /sbin/mdadm ]; then
-+ /sbin/mdadm --assemble --scan
-+ RESULT=$?
-+ fi
-+ if [ $RESULT -gt 0 -a -x /sbin/raidstart ]; then
- /sbin/raidstart $i
- RESULT=$?
- fi
+++ /dev/null
-diff -urN rc-scripts-0.4.0.10.org/rc.d/rc.sysinit rc-scripts-0.4.0.10/rc.d/rc.sysinit
---- rc-scripts-0.4.0.10.org/rc.d/rc.sysinit 2004-05-17 02:20:31.352691184 +0200
-+++ rc-scripts-0.4.0.10/rc.d/rc.sysinit 2004-05-17 02:20:56.136923408 +0200
-@@ -451,7 +451,7 @@
- fi
- # LVM
- if is_yes "$EVMS_LVM" || [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
-- lvmversion=$(/sbin/vgchange --version 2>/dev/null|head -n 1|awk '{gsub("vgchange: Logical Volume Manager ",""); gsub("LVM version: ",""); gsub(/\..*/,"");print $1}')
-+ lvmversion=$(/sbin/vgchange --version 2>/dev/null|awk '{gsub("vgchange: Logical Volume Manager ",""); gsub("LVM version: ",""); gsub(/\..*/,"");print $1; exit}')
- if [ "$lvmversion" = "1" ] ; then
- modprobe -s -k lvm-mod >/dev/null 2>&1
- lvmignorelock=""
+++ /dev/null
-diff -ru rc-scripts-0.3.1/rc.d/init.d/functions.network rc-scripts-0.3.1-AX/rc.d/init.d/functions.network
---- rc-scripts-0.3.1/rc.d/init.d/functions.network Sat Nov 9 00:41:49 2002
-+++ rc-scripts-0.3.1-AX/rc.d/init.d/functions.network Mon Nov 19 20:07:17 2001
-@@ -328,7 +328,7 @@
- if [ -z "${GATEWAYDEV}" -o "${GATEWAYDEV}" = "${DEVICE}" ]; then
- # set up default gateway
- if [ -n "${GATEWAY}" ]; then
-- ip -4 route add default via ${GATEWAY} dev ${DEVICE} ${IP4SRCADDR} ${TNLOPTS}
-+ ip -4 route add default via ${GATEWAY} dev ${DEVICE} ${IP4SRCADDR} ${TNLOPTS} onlink
- DEFGW=${GATEWAY}
- elif [ "${GATEWAYDEV}" = "${DEVICE}" ]; then
- ip -4 route add default dev ${DEVICE} ${IP4SRCADDR} ${TNLOPTS}
-@@ -342,7 +342,7 @@
- if [ -z "${GATEWAY6DEV}" -o "${GATEWAY6DEV}" = "${DEVICE}" ]; then
- # set up default gateway
- if [ -n "${GATEWAY6}" ]; then
-- ip -6 route add default via ${GATEWAY6} dev ${DEVICE} ${IP6SRCADDR}
-+ ip -6 route add default via ${GATEWAY6} dev ${DEVICE} ${IP6SRCADDR} onlink
- DEFGW6=${GATEWAY6}
- elif [ "${GATEWAY6DEV}" = "${DEVICE}" ]; then
- ip -6 route add default dev ${DEVICE} ${IP6SRCADDR}
-Only in rc-scripts-0.3.1/rc.d/init.d: functions.network~
+++ /dev/null
---- rc-scripts-0.3.1/po/pl.po~ Sun Jan 12 13:20:14 2003
-+++ rc-scripts-0.3.1/po/pl.po Sun Jan 12 13:23:05 2003
-@@ -235,10 +235,6 @@
- msgid "Remounting encrypted filesystems back in rw mode"
- msgstr "Przelaczanie zaszyfrowanych systemów plików w tryb zapis/odczyt"
-
--#: ./rc.d/rc.sysinit:387
--msgid "Automatic reboot in progress"
--msgstr "Automatyczny restart w toku"
--
- #: ./rc.d/init.d/functions:125
- msgid "Stopping %s service"
- msgstr "Zatrzymywanie uslugi %s"
-@@ -526,6 +522,7 @@
- msgstr "Uzycie: %s"
-
- #: ./rc.d/rc.sysinit:195
-+#: ./rc.d/rc.sysinit:387
- #: ./rc.d/rc.sysinit:423
- #: ./rc.d/rc.sysinit:484
- msgid "Automatic reboot in progress"
+++ /dev/null
-diff -urN rc-scripts-0.3.1.orig/po/pl.po rc-scripts-0.3.1/po/pl.po
---- rc-scripts-0.3.1.orig/po/pl.po Thu Jan 24 15:09:34 2002
-+++ rc-scripts-0.3.1/po/pl.po Wed Nov 27 16:28:22 2002
-@@ -505,7 +505,7 @@
- #: ./rc.d/rc.sysinit:133
- #: ./rc.d/rc.sysinit:500
- msgid "Today`s date:"
--msgstr "Dziesiejsza data:"
-+msgstr "Dzisiejsza data:"
-
- #: ./rc.d/rc.sysinit:140
- msgid "Activating swap partitions"
+++ /dev/null
-diff -Nur rc-scripts-0.3.1.orig/sysconfig/interfaces/ifcfg-description rc-scripts-0.3.1/sysconfig/interfaces/ifcfg-description
---- rc-scripts-0.3.1.orig/sysconfig/interfaces/ifcfg-description Sat Jul 21 21:18:46 2001
-+++ rc-scripts-0.3.1/sysconfig/interfaces/ifcfg-description Fri Aug 23 17:56:05 2002
-@@ -80,6 +80,7 @@
- DISCONNECTTIMEOUT=<number of seconds, default currently 5>
- RETRYTIMEOUT=<number of seconds, default currently 60>
- INITSCRIPT=<modem command>
-+ SHUTDOWNSLEEP=<seconds to wait for pppd shutdown before giving up, default 2>
- DATAFORCHAT=<list of variables>
- <anything>=<anything> (for chat script)
- IPV6_PPP=yes|no (use IPv6 for ppp ?)
-diff -Nur rc-scripts-0.3.1.orig/sysconfig/interfaces/ifcfg-ppp0.tpsa rc-scripts-0.3.1/sysconfig/interfaces/ifcfg-ppp0.tpsa
---- rc-scripts-0.3.1.orig/sysconfig/interfaces/ifcfg-ppp0.tpsa Thu Aug 16 15:11:20 2001
-+++ rc-scripts-0.3.1/sysconfig/interfaces/ifcfg-ppp0.tpsa Fri Aug 23 17:54:34 2002
-@@ -17,6 +17,7 @@
- USER=ppp
- PASSWORD=ppp
- INITSTRING=ATe0s2=255
-+SHUTDOWNSLEEP=10
- DATAFORCHAT="USER PASSWORD INITSTRING PHONE"
-
- REPORTFILE=/var/log/ppp0.log
-diff -Nur rc-scripts-0.3.1.orig/sysconfig/network-scripts/ifdown-ppp rc-scripts-0.3.1/sysconfig/network-scripts/ifdown-ppp
---- rc-scripts-0.3.1.orig/sysconfig/network-scripts/ifdown-ppp Tue May 15 18:06:00 2001
-+++ rc-scripts-0.3.1/sysconfig/network-scripts/ifdown-ppp Fri Aug 23 17:52:21 2002
-@@ -38,7 +38,11 @@
- /etc/sysconfig/network-scripts/ifdown-post $1
- exit 0
- fi
--sleep 2
-+if [ -n "$SHUTDOWNSLEEP" ]; then
-+ sleep $SHUTDOWNSLEEP
-+else
-+ sleep 2
-+fi
- if [ ! -d /proc/$PID ]; then
- /etc/sysconfig/network-scripts/ifdown-post $1
- exit 0
+++ /dev/null
-diff -urN rc-scripts.orig/rc.d/rc.sysinit rc-scripts-0.4.0.4/rc.d/rc.sysinit
---- rc-scripts.orig/rc.d/rc.sysinit 2003-10-31 00:43:58.000000000 +0100
-+++ rc-scripts-0.4.0.4/rc.d/rc.sysinit 2003-10-31 16:14:30.126407224 +0100
-@@ -266,7 +266,7 @@
- # Enter root, /proc, /sys, devfs and other into mtab.
- mount -f /
- mount -f /proc
--mount -f /dev/pts
-+#mount -f /dev/pts
- [ -f /proc/bus/usb/devices ] && mount -f -t usbdevfs usbdevfs /proc/bus/usb
- [ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev
-
+++ /dev/null
-Index: rc.d/init.d/functions
-===================================================================
---- rc.d/init.d/functions (revision 3049)
-+++ rc.d/init.d/functions (revision 3062/5)
-@@ -398,10 +398,8 @@
- limits="${SERVICE_LIMITS:-$DEFAULT_SERVICE_LIMITS}"
- # elif [ -n "`$SH -c 'echo ${.sh.version}' 2>/dev/null`" ]; then
- fi
-- while echo "$limits" | grep -q '[^ ]'; do
-- ulimit `echo ${limits} | awk '/^ *-[^-]*-.*$/ {sub(/^[^-]*-/,"");sub(/-.*$/,"");sub(/^.*$/,"-&");}{print;}'
-- limits="`echo ${limits} | awk '/^ *-[^-]*-.*$/ {sub(/^[^-]*-[^-]*/,"");}{print;}'
-- done
-+
-+ echo $limits|awk 'BEGIN {RS="[-\n]";} !/^$/ {system ("ulimit -" $0);}'
-
- # And start it up.
- busy
+++ /dev/null
-diff -ru rc-scripts-0.3.1/rc.d/rc.sysinit rc-scripts-0.3.1-AlchemyX/rc.d/rc.sysinit
---- rc-scripts-0.3.1/rc.d/rc.sysinit Sun Jan 27 03:13:50 2002
-+++ rc-scripts-0.3.1-AlchemyX/rc.d/rc.sysinit Sun Dec 1 14:47:00 2002
-@@ -174,8 +174,8 @@
-
- rc=$?
-
-- # A return of 2 or higher means there were serious problems.
-- if [ $rc -gt 1 ]; then
-+ # A return of 4 or higher means there were serious problems.
-+ if [ $rc -gt 3 ]; then
- # don't use '\n' in nls macro !
- echo
- echo
-@@ -193,6 +193,18 @@
-
- run_cmd "Unmounting file systems" umount -a
- mount -n -o remount,ro /
-+ run_cmd "Automatic reboot in progress" reboot
-+ # A return of 2 or 3 means that filesystem was repaired but we need
-+ # to reboot.
-+ elif [ "$rc" = "2" -o "$rc" = "3" ]; then
-+ echo
-+ nls "*** Filesystem was repaired but system needs to be"
-+ nls "*** rebooted before mounting it."
-+ nls "*** REBOOTING ***"
-+ echo
-+
-+ run_cmd "Unmounting file systems" umount -a
-+ mount -n -o remount,ro /
- run_cmd "Automatic reboot in progress" reboot
- elif [ "$rc" = "1" ]; then
- _RUN_QUOTACHECK=1
+++ /dev/null
-diff -ru rc-scripts-0.3.1/rc.d/init.d/functions.network rc-scripts-0.3.1-AX/rc.d/init.d/functions.network
---- rc-scripts-0.3.1/rc.d/init.d/functions.network Mon Nov 19 20:07:17 2001
-+++ rc-scripts-0.3.1-AX/rc.d/init.d/functions.network Fri Nov 8 23:49:10 2002
-@@ -150,11 +150,11 @@
- if [ -r /etc/sysconfig/static-nat ]; then
- grep "^[0-9]" /etc/sysconfig/static-nat | while read src via dst; do
- if [ "$1" = "on" ]; then
-- /sbin/ip route add nat $src via $dst
-- /sbin/ip rule add from $dst nat $src
-+ /sbin/ip route add nat $dst via $src
-+ /sbin/ip rule add from $src nat $dst
- elif [ "$1" = "off" ]; then
-- /sbin/ip rule del from $dst nat $src
-- /sbin/ip route del nat $src via $dst
-+ /sbin/ip rule del from $src nat $dst
-+ /sbin/ip route del nat $dst via $src
- fi
- done
- fi
-diff -ru rc-scripts-0.3.1/sysconfig/static-nat rc-scripts-0.3.1-AX/sysconfig/static-nat
---- rc-scripts-0.3.1/sysconfig/static-nat Mon Jun 28 15:07:45 1999
-+++ rc-scripts-0.3.1-AX/sysconfig/static-nat Fri Nov 8 23:45:47 2002
-@@ -0,0 +1,3 @@
-+# <IP>[/<mask>] via <IP>
-+# 192.168.1.1 via 1.1.1.1
-+# 192.168.2.1/24 via 1.1.1.1
+++ /dev/null
-diff -urN rc-scripts.orig/rc.d/rc.shutdown rc-scripts-0.4.0.2/rc.d/rc.shutdown
---- rc-scripts.orig/rc.d/rc.shutdown 2003-10-02 20:46:49.000000000 +0200
-+++ rc-scripts-0.4.0.2/rc.d/rc.shutdown 2003-10-08 16:49:56.178983872 +0200
-@@ -40,7 +40,7 @@
- sig=-15
- retry=3
- force=
--remaining=$(awk '!/(^#| proc | loopfs | devfs | devpts | shm | iso9660 | ramfs | tmpfs |^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts)
-+remaining=$(awk '!/(^#| proc | loopfs | devfs | devpts | shm | iso9660 | ramfs | tmpfs | sysfs |^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts)
- while [ -n "$remaining" -a "$retry" -gt 0 ]
- do
- show "Unmounting file systems" ; busy
-@@ -52,7 +52,7 @@
- fi
-
- sleep 2
-- remaining=$(awk '!/(^#| proc | loopfs | devfs | devpts | shm |^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts)
-+ remaining=$(awk '!/(^#| proc | loopfs | devfs | devpts | shm | sysfs |^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts)
- [ -z "$remaining" ] && break
- /sbin/fuser -k -m $sig $remaining > /dev/null
- sleep 5
+++ /dev/null
-diff -uNr rc-scripts-0.3.1.orig/sysconfig/network-scripts/ifdown-post rc-scripts-0.3.1/sysconfig/network-scripts/ifdown-post
---- rc-scripts-0.3.1.orig/sysconfig/network-scripts/ifdown-post Tue May 15 18:06:00 2001
-+++ rc-scripts-0.3.1/sysconfig/network-scripts/ifdown-post Wed Feb 11 13:40:29 2004
-@@ -1,6 +1,6 @@
- #!/bin/sh
- #
--# $Id$
-+# $Id$
- #
- # This should be called whenever an interface goes down, not just when
- # it is brought down explicitly.
-@@ -20,9 +20,23 @@
- # set REALDEVICE
- get_ppp_device_and_pid
-
--# Delete root queueing discipline
--if [ -n "$QDISC" ]; then
-- tc qdisc del dev "$REALDEVICE" root $QDISC
-+# (QoS) Delete root queueing discipline
-+if [ -n "${BANDWIDTH_OUT}" ]; then
-+ if [ "${QDISC_CLASS}" = "htb" -o "${QDISC_CLASS}" = "cbq" ]; then
-+ tc qdisc del dev ${REALDEVICE} root
-+ elif [ -z "${QDISC}" -o "${QDISC}" = "tbf" ]; then
-+ tc qdisc del dev ${REALDEVICE} root
-+ elif [ -n "${QDISC}" ]; then
-+ tc qdisc del dev ${REALDEVICE} root
-+ fi
-+else
-+ if [ -n "${QDISC}" ]; then
-+ tc qdisc add dev ${REALDEVICE} root
-+ fi
-+fi
-+
-+if [ -n "${BANDWIDTH_IN}" ]; then
-+ tc qdisc del dev ${REALDEVICE} ingress
- fi
-
- # execute run_down() function (if available in device configuration file)
-diff -uNr rc-scripts-0.3.1.orig/sysconfig/network-scripts/ifup-post rc-scripts-0.3.1/sysconfig/network-scripts/ifup-post
---- rc-scripts-0.3.1.orig/sysconfig/network-scripts/ifup-post Wed Feb 11 13:38:21 2004
-+++ rc-scripts-0.3.1/sysconfig/network-scripts/ifup-post Wed Feb 11 13:40:29 2004
-@@ -1,6 +1,6 @@
- #!/bin/sh
- #
--# $Id$
-+# $Id$
- #
-
- run_up() { :; }
-@@ -19,10 +19,37 @@
- # set REALDEVICE
- get_ppp_device_and_pid
-
--if [ -n "$QDISC" ]; then
--# Set the queuing discipline
--# eg: sfq for better link sharing or teql0 for link equalizer
-- tc qdisc add dev "$REALDEVICE" root $QDISC
-+# Simple QoS support (bandwidth limit)
-+if [ -n "${BANDWIDTH_OUT}" ]; then
-+ if [ "${QDISC_CLASS}" = "htb" -o "${QDISC_CLASS}" = "cbq" ]; then
-+ case "${QDISC_CLASS}" in
-+ htb)
-+ tc qdisc add dev ${REALDEVICE} root handle 1: htb default 10
-+ tc class add dev ${REALDEVICE} parent 1: classid 1:10 htb rate ${BANDWIDTH_OUT}kbit ceil ${BANDWIDTH_OUT}kbit
-+ [ -n "${QDISC}" ] && tc qdisc add dev ${REALDEVICE} parent 1:10 ${QDISC}
-+ ;;
-+ cbq)
-+ # FIXME: hardcoded ethernet speed (bandwidth)
-+ tc qdisc add dev ${REALDEVICE} root handle 1: cbq bandwidth 100000kbit cell 8 avpkt 1000 mpu 64
-+ tc class add dev ${REALDEVICE} parent 1: classid 1:10 cbq bandwidth 100000kbit rate ${BANDWIDTH_OUT}kbit maxburst 5 avpkt 1000 allot 1514 bounded
-+ [ -n "${QDISC}" ] && tc qdisc add dev ${REALDEVICE} parent 1:10 ${QDISC}
-+ tc filter add dev ${REALDEVICE} protocol ip parent 1: u32 match ip src 0.0.0.0/0 flowid 1:10
-+ ;;
-+ esac
-+ elif [ -z "${QDISC}" -o "${QDISC}" = "tbf" ]; then
-+ tc qdisc add dev ${REALDEVICE} root tbf rate ${BANDWIDTH_OUT}kbit latency 50ms burst 51200
-+ elif [ -n "${QDISC}" ]; then
-+ tc qdisc add dev ${REALDEVICE} root ${QDISC}
-+ fi
-+else
-+ if [ -n "${QDISC}" ]; then
-+ tc qdisc add dev ${REALDEVICE} root ${QDISC}
-+ fi
-+fi
-+
-+if [ -n "${BANDWIDTH_IN}" ]; then
-+ tc qdisc add dev ${REALDEVICE} handle ffff: ingress
-+ tc filter add dev ${REALDEVICE} parent ffff: protocol ip prio 50 u32 match ip src 0.0.0.0/0 police rate ${BANDWIDTH_IN}kbit burst 10k drop flowid :3
- fi
-
- /etc/sysconfig/network-scripts/ifup-aliases ${CONFIG}
+++ /dev/null
---- rc-scripts-0.3.1/rc.d/init.d/timezone.orig Sun May 13 17:10:17 2001
-+++ rc-scripts-0.3.1/rc.d/init.d/timezone Tue Jun 17 13:50:42 2003
-@@ -18,7 +18,7 @@
-
- ZONE_FILE="$ZONE_INFO_DIR"
-
--if [ -n "$ZONE_INFO_SCHEME" ]; then
-+if [ -n "$ZONE_INFO_SCHEME" -a "$ZONE_INFO_SCHEME" != "posix" ]; then
- ZONE_FILE="$ZONE_FILE/$ZONE_INFO_SCHEME"
- fi
-
+++ /dev/null
-diff -urN aa/rc-scripts-0.4.0.15/rc.d/rc.sysinit rc-scripts-0.4.0.15/rc.d/rc.sysinit
---- aa/rc-scripts-0.4.0.15/rc.d/rc.sysinit 2004-08-20 14:16:03.000000000 +0200
-+++ rc-scripts-0.4.0.15/rc.d/rc.sysinit 2004-09-18 12:03:38.056855848 +0200
-@@ -27,6 +27,14 @@
- mount -n -o gid=17 -t sysfs sysfs /sys
- fi
-
-+# udev support
-+if [ -r /etc/sysconfig/udev ]; then
-+ . /etc/sysconfig/udev
-+ if is_yes "$USE_UDEV" && [ -x /sbin/start_udev ]; then
-+ /sbin/start_udev
-+ fi
-+fi
-+
- # selinux
- if grep -q selinuxfs /proc/filesystems && ! grep -q selinuxfs /proc/mounts; then
- mount -n -o gid=17 -t selinuxfs selinuxfs /selinux
+++ /dev/null
-diff -Nur rc-scripts-0.4.0.2.orig/rc.d/init.d/functions rc-scripts-0.4.0.2/rc.d/init.d/functions
---- rc-scripts-0.4.0.2.orig/rc.d/init.d/functions 2003-10-02 20:46:49.000000000 +0200
-+++ rc-scripts-0.4.0.2/rc.d/init.d/functions 2003-10-12 15:50:17.035580952 +0200
-@@ -263,13 +263,18 @@
- return $exit_code
- }
-
--# A function to start a program (now it's usefull on read-only filesystem too)
-+# A function to start a program (now it's useful on read-only filesystem too)
- daemon()
- {
-- typeset errors="" prog=""
-+ typeset errors="" prog="" limits=""
- typeset -i exit_code=0
- [ -z "$DEFAULT_SERVICE_RUN_NICE_LEVEL" ] && DEFAULT_SERVICE_RUN_NICE_LEVEL=0
-- # Test syntax. Don't use -o instead || here - this will broke ksh --misiek
-+ # "-u unlimited" (-p for ksh) to make sure daemons will be able to fork.
-+ # "-c 0" to make sure it doesn't core dump anywhere; while this could mask
-+ # problems with the daemon, it also closes some security problems.
-+ # Users' limits are set via pam_limits.
-+ [ -z "$DEFAULT_SERVICE_LIMITS" ] && DEFAULT_SERVICE_LIMITS_HARD="-u unlimited -c 0"
-+ # Test syntax. Don't use -o instead || here - this will break ksh --misiek
- while [ "$1" != "${1##-}" ] || [ "$1" != "${1##+}" ]; do
- case $1 in
- '')
-@@ -299,20 +304,18 @@
- prog="$prog $*"
- fi
-
-- # make sure it doesn't core dump anywhere; while this could mask
-- # problems with the daemon, it also closes some security problems
-- ulimit -c 0
--
-- # Make sure daemons will be able to fork.
-- # Limits are set via pam_limits.
- if [ -n "$KSH_VERSION" ]; then
-- ulimit -p unlimited
-+ limits="`echo ${SERVICE_LIMITS:-$DEFAULT_SERVICE_LIMITS} | sed -e 's/-\([SH]\?\)u/-\1p/'`"
- elif [ -n "$ZSH_VERSION" ]; then
-- ulimit -u unlimited
-+ limits="${SERVICE_LIMITS:-$DEFAULT_SERVICE_LIMITS}"
- elif [ -n "$BASH_VERSION" ]; then
-- ulimit -u unlimited
-+ limits="${SERVICE_LIMITS:-$DEFAULT_SERVICE_LIMITS}"
- # elif [ -n "`$SH -c 'echo ${.sh.version}' 2>/dev/null`" ]; then
- fi
-+ while echo "$limits" | grep -q '[^ ]'; do
-+ ulimit `echo ${limits} | sed -e 's/^ *\(-[^-]*\)\(-.*\)\?$/\1/'`
-+ limits="`echo ${limits} | sed -e 's/^ *\(-[^-]*\)\(-.*\)\?$/\2/'`"
-+ done
-
- # And start it up.
- busy
-diff -Nur rc-scripts-0.4.0.2.orig/sysconfig/system rc-scripts-0.4.0.2/sysconfig/system
---- rc-scripts-0.4.0.2.orig/sysconfig/system 2003-10-02 20:46:49.000000000 +0200
-+++ rc-scripts-0.4.0.2/sysconfig/system 2003-10-12 15:50:53.502037208 +0200
-@@ -17,6 +17,17 @@
- # $SERVICE_RUN_NICE_LEVEL is not defined in /etc/sysconfig/<service>
- DEFAULT_SERVICE_RUN_NICE_LEVEL=0
-
-+# Default limits set before running demons (hard and soft) if
-+# $SERVICE_LIMITS are not defined in /etc/sysconfig/<service>
-+# Use "-u" for process limits (automatically translated to "-p" for ksh).
-+# Use "-Sx" or "-Hx" to set only soft or hard "x" limit.
-+# Advised limits are:
-+# "-u unlimited" to make sure daemons will be able to fork;
-+# "-c 0" to make sure it doesn't core dump anywhere; while this could mask
-+# problems with the daemon, it also closes some security problems;
-+# users' limits are set via pam_limits.
-+DEFAULT_SERVICE_LIMITS="-u unlimited -c 0"
-+
- # Setup PNP using userspace tools?
- RUN_USERPNP=yes
- # Setup kernel space PNP (2.4.x)
+++ /dev/null
-diff -durN rc-scripts-0.3.1.orig/rc.d/rc.shutdown rc-scripts-0.3.1/rc.d/rc.shutdown
---- rc-scripts-0.3.1.orig/rc.d/rc.shutdown Sun Jan 27 03:13:29 2002
-+++ rc-scripts-0.3.1/rc.d/rc.shutdown Fri Nov 14 10:08:21 2003
-@@ -90,6 +90,11 @@
- if [ "$runlevel" = "0" ] ; then
- show "The system is halted"; ok
- [ -f /fastboot ] && (show "On the next boot fsck will be skipped."; ok)
-+
-+ if [ -x /sbin/poweroff-ups -a -f /etc/killpower -a -f /etc/sysconfig/ups ] ; then
-+ . /etc/sysconfig/ups
-+ is_yes "$POWEROFF_UPS" && /sbin/poweroff-ups
-+ fi
- eval halt -d -p
- else
- show "Please stand by while rebooting the system"; ok
-diff -durN rc-scripts-0.3.1.orig/rc.d/rc.sysinit rc-scripts-0.3.1/rc.d/rc.sysinit
---- rc-scripts-0.3.1.orig/rc.d/rc.sysinit Fri Nov 14 09:27:20 2003
-+++ rc-scripts-0.3.1/rc.d/rc.sysinit Fri Nov 14 10:08:20 2003
-@@ -574,7 +574,7 @@
- fi
-
- # Clean up /etc.
--rm -f /fastboot /fsckoptions /forcefsck /halt /poweroff
-+rm -f /fastboot /fsckoptions /forcefsck /halt /poweroff /etc/killpower
-
- # Clean up /var
- # I'd use find, but /usr may not be mounted.
+++ /dev/null
---- rc-scripts-0.3.1/rc.d/init.d/functions.network~ Wed Oct 30 16:39:15 2002
-+++ rc-scripts-0.3.1/rc.d/init.d/functions.network Wed Oct 30 16:39:15 2002
-@@ -354,7 +354,7 @@
- if [ -n "${IPV6_GLOBALROUTEGW}" ]; then
- ip -6 route add 2000::/3 via ${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR}
- elif [ "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
-- ip -6 route add 2000::/3 via dev ${DEVICE} ${IP6SRCADDR}
-+ ip -6 route add 2000::/3 dev ${DEVICE} ${IP6SRCADDR}
- fi
- fi
- fi
+++ /dev/null
-diff -urN rc-scripts-0.3.1.org/rc.d/init.d/functions.network rc-scripts-0.3.1/rc.d/init.d/functions.network
---- rc-scripts-0.3.1.org/rc.d/init.d/functions.network Wed Aug 7 19:51:25 2002
-+++ rc-scripts-0.3.1/rc.d/init.d/functions.network Wed Aug 7 20:06:10 2002
-@@ -361,6 +361,13 @@
- fi
- }
-
-+is_wireless_device () {
-+ if [ -x /sbin/iwconfig ]; then
-+ LC_ALL=C iwconfig "${1}" 2>&1 | grep -q "no wireless extensions" || return 0
-+ fi
-+ return 1
-+}
-+
- #
- # following function sets up routes not associated to any device
- # eg. unreachable or blackhole routes
-diff -urN rc-scripts-0.3.1.org/sysconfig/network-scripts/ifup rc-scripts-0.3.1/sysconfig/network-scripts/ifup
---- rc-scripts-0.3.1.org/sysconfig/network-scripts/ifup Wed Aug 7 19:51:25 2002
-+++ rc-scripts-0.3.1/sysconfig/network-scripts/ifup Wed Aug 7 19:53:10 2002
-@@ -104,6 +104,42 @@
- if is_yes "${IPV6_NETWORKING}" && is_yes "${IPV6_DISABLE_AUTOCONF}"; then
- run_cmd "Disabling IPv6 autoconfiguration" sysctl -w net.ipv6.conf.${DEVICE}=0
- fi
-+
-+if is_wireless_device "${DEVICE}"; then
-+ [ -z "${WLAN_NICKNAME}" ] && WLAN_NICKNAME="$(hostname -f)"
-+
-+ # wlan mode needs to be first
-+ [ -n "${WLAN_MODE}" ] && iwconfig ${DEVICE} mode ${WLAN_MODE}
-+ iwconfig ${DEVICE} nickname ${WLAN_NICKNAME}
-+ [ -n "${WLAN_ESSID}" ] && iwconfig ${DEVICE} essid ${WLAN_ESSID}
-+ [ -n "${WLAN_NWID}" ] && iwconfig ${DEVICE} nwid ${WLAN_NWID}
-+ if [ -n "${WLAN_FREQ}" -a "${WLAN_MODE}" != "Managed" ] ; then
-+ iwconfig ${DEVICE} freq ${WLAN_FREQ}
-+ elif [ -n "${WLAN_CHANNEL}" -a "${WLAN_MODE}" != "Managed" ]; then
-+ iwconfig ${DEVICE} channel ${WLAN_CHANNEL}
-+ fi
-+ [ -n "${WLAN_SENS}" ] && iwconfig ${DEVICE} sens ${WLAN_SENS}
-+ [ -n "${WLAN_AP}" ] && iwconfig ${DEVICE} ap ${WLAN_AP}
-+ [ -n "${WLAN_BITRATE}" ] && iwconfig ${DEVICE} rate ${WLAN_BITRATE}
-+ [ -n "${WLAN_RTS_THRESHOLD}" ] && iwconfig ${DEVICE} rts ${WLAN_RTS_THRESHOLD}
-+ [ -n "${WLAN_FRAGMENTATION_THRESHOLD}" ] && iwconfig ${DEVICE} frag ${WLAN_FRAGMENTATION_THRESHOLD}
-+ if [ -n "${WLAN_KEY}" ]; then
-+ iwconfig ${DEVICE} key ${WLAN_KEY}
-+ [ -n "${WLAN_ENCRYPTION}" ] && iwconfig ${DEVICE} key ${WLAN_ENCRYPTION}
-+ fi
-+ if is_no "${WLAN_ENCRYPTION}"; then
-+ iwconfig ${DEVICE} key off
-+ fi
-+ [ -n "${WLAN_POWER}" ] && iwconfig ${DEVICE} ${WLAN_POWER}
-+ [ -n "${WLAN_TXPOWER}" ] && iwconfig ${DEVICE} ${WLAN_TXPOWER}
-+ [ -n "${WLAN_RETRY}" ] && iwconfig ${DEVICE} ${WLAN_RETRY}
-+ if is_yes "${WLAN_COMMIT}"; then
-+ iwconfig ${DEVICE} commit
-+ fi
-+ [ -n "${WLAN_NWID}" ] && iwconfig ${DEVICE} nwid ${WLAN_NWID}
-+ # essid should be last due to netowork rescanning by wlan devices
-+ [ -n "${WLAN_ESSID}" ] && iwconfig ${DEVICE} essid ${WLAN_ESSID}
-+fi
-
- if [ "$HANDLING" = "2" ]; then
- exit 0
projects / packages / rc-scripts.git / commitdiff