Christian Wiese
15 years ago
5 changed files with 228 additions and 3 deletions
@ -0,0 +1,41 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../etcnet/0001-removed-unintentionally-left-debug-line.patch
|
||||
# Copyright (C) 2010 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From 221cbec3b0f5c83e1bc64209fd2068dad4fd3283 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Bolshakov <sbolshakov@altlinux.org>
|
||||
Date: Sun, 17 Jan 2010 17:32:00 +0300
|
||||
Subject: [PATCH 1/4] removed unintentionally left debug line
|
||||
|
||||
---
|
||||
etc/net/scripts/ifdown-removable | 2 --
|
||||
1 files changed, 0 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/etc/net/scripts/ifdown-removable b/etc/net/scripts/ifdown-removable
|
||||
index 469d5f4..cfe38a8 100755
|
||||
--- a/etc/net/scripts/ifdown-removable
|
||||
+++ b/etc/net/scripts/ifdown-removable
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
# This script is a hook for hotplug or pcmcia-cs.
|
||||
|
||||
-/sbin/ip ad > /tmp/ipad
|
||||
-
|
||||
usage()
|
||||
{
|
||||
echo "Usage: $0 <interface>" >&2
|
||||
--
|
||||
1.6.6.2
|
||||
|
||||
@ -0,0 +1,100 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../etcnet/0002-redo-BOOTPROTO-separator-match-in-locale-insensitive.patch
|
||||
# Copyright (C) 2010 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From 670cedacc62048bbfa8e46d58d27786d67170870 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Bolshakov <sbolshakov@altlinux.org>
|
||||
Date: Sun, 17 Jan 2010 17:52:03 +0300
|
||||
Subject: [PATCH 2/4] redo BOOTPROTO separator match in locale-insensitive manner
|
||||
|
||||
---
|
||||
etc/net/scripts/config-ipv4 | 6 +++---
|
||||
etc/net/scripts/ifdown | 4 ++--
|
||||
etc/net/scripts/ifdown-ifplugd | 2 +-
|
||||
etc/net/scripts/ifdown-removable | 2 +-
|
||||
4 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/etc/net/scripts/config-ipv4 b/etc/net/scripts/config-ipv4
|
||||
index c4c0b9d..ce6dc0e 100755
|
||||
--- a/etc/net/scripts/config-ipv4
|
||||
+++ b/etc/net/scripts/config-ipv4
|
||||
@@ -33,13 +33,13 @@ case $ACTION in
|
||||
ipv4ll)
|
||||
try_ipv4ll && config_ipv4_routes_rules add
|
||||
;;
|
||||
- dhcp[\ -,]static)
|
||||
+ dhcp[-,\ ]static)
|
||||
try_dhcp || try_static && config_ipv4_routes_rules add
|
||||
;;
|
||||
- dhcp[\ -,]ipv4ll)
|
||||
+ dhcp[-,\ ]ipv4ll)
|
||||
try_dhcp || try_ipv4ll && config_ipv4_routes_rules add
|
||||
;;
|
||||
- dhcp[\ -,]ipv4ll[\ -,]static)
|
||||
+ dhcp[-,\ ]ipv4ll[-,\ ]static)
|
||||
try_dhcp || try_ipv4ll || try_static && config_ipv4_routes_rules add
|
||||
;;
|
||||
*)
|
||||
diff --git a/etc/net/scripts/ifdown b/etc/net/scripts/ifdown
|
||||
index 60db2df..76ccac1 100755
|
||||
--- a/etc/net/scripts/ifdown
|
||||
+++ b/etc/net/scripts/ifdown
|
||||
@@ -59,7 +59,7 @@ xargise_file $MYIFACEDIR/ipneigh "$IP neigh del dev $NAME"
|
||||
|
||||
# Look if there is DHCP agent hanging around.
|
||||
case "$BOOTPROTO" in
|
||||
- dhcp|dhcp[\ -,]static|dhcp[\ -,]ipv4ll|dhcp[\ -,]ipv4ll[\ -,]static)
|
||||
+ dhcp|dhcp[-,\ ]static|dhcp[-,\ ]ipv4ll|dhcp[-,\ ]ipv4ll[-,\ ]static)
|
||||
stop_dhcp_client
|
||||
;;
|
||||
*)
|
||||
@@ -68,7 +68,7 @@ esac
|
||||
|
||||
# Kill ipv4ll agent, if any.
|
||||
case "$BOOTPROTO" in
|
||||
- ipv4ll|dhcp[\ -,]ipv4ll|dhcp[\ -,]ipv4ll[\ -,]static)
|
||||
+ ipv4ll|dhcp[-,\ ]ipv4ll|dhcp[-,\ ]ipv4ll[-,\ ]static)
|
||||
stop_ipv4ll_client
|
||||
;;
|
||||
*)
|
||||
diff --git a/etc/net/scripts/ifdown-ifplugd b/etc/net/scripts/ifdown-ifplugd
|
||||
index b03320b..86e9a05 100755
|
||||
--- a/etc/net/scripts/ifdown-ifplugd
|
||||
+++ b/etc/net/scripts/ifdown-ifplugd
|
||||
@@ -46,7 +46,7 @@ fi
|
||||
xargise_file $MYIFACEDIR/ipneigh "$IP neigh del dev $NAME"
|
||||
|
||||
case "$BOOTPROTO" in
|
||||
- dhcp|dhcp[\ -,]static|dhcp[\ -,]ipv4ll[\ -,]static)
|
||||
+ dhcp|dhcp[-,\ ]static|dhcp[-,\ ]ipv4ll[-,\ ]static)
|
||||
stop_dhcp_client
|
||||
;;
|
||||
*)
|
||||
diff --git a/etc/net/scripts/ifdown-removable b/etc/net/scripts/ifdown-removable
|
||||
index cfe38a8..c631fab 100755
|
||||
--- a/etc/net/scripts/ifdown-removable
|
||||
+++ b/etc/net/scripts/ifdown-removable
|
||||
@@ -87,7 +87,7 @@ fi
|
||||
is_yes "$IFDOWN_CHILDREN" && ifdown_children
|
||||
xargise_file $MYIFACEDIR/ipneigh "$IP neigh del dev $NAME"
|
||||
case "$BOOTPROTO" in
|
||||
- dhcp|dhcp[\ -,]static|dhcp[\ -,]ipv4ll|dhcp[\ -,]ipv4ll[\ -,]static)
|
||||
+ dhcp|dhcp[-,\ ]static|dhcp[-,\ ]ipv4ll|dhcp[-,\ ]ipv4ll[-,\ ]static)
|
||||
stop_dhcp_client
|
||||
;;
|
||||
*)
|
||||
--
|
||||
1.6.6.2
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../etcnet/0003-fix-use-of-VARPREFIX-in-sysctl-completion-code.patch
|
||||
# Copyright (C) 2010 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From 2f8d7bc5e3acf2a75cee38a2c2d295687b897547 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Bolshakov <sbolshakov@altlinux.org>
|
||||
Date: Sun, 17 Jan 2010 20:00:38 +0300
|
||||
Subject: [PATCH 3/4] fix use of VARPREFIX in sysctl completion code
|
||||
|
||||
---
|
||||
etc/net/scripts/ifup-common | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/etc/net/scripts/ifup-common b/etc/net/scripts/ifup-common
|
||||
index 5b85b73..3570077 100755
|
||||
--- a/etc/net/scripts/ifup-common
|
||||
+++ b/etc/net/scripts/ifup-common
|
||||
@@ -187,6 +187,8 @@ process_sysctl_conf()
|
||||
print_error "Can't autocomplete sysctl variable name '$VARNAME' in file '$SRCFILE'. Please fix"
|
||||
return 1
|
||||
esac
|
||||
+ else
|
||||
+ VARPREFIX=
|
||||
fi
|
||||
$SYSCTL -q -w $VARPREFIX$VARNAME=$VARVALUE
|
||||
done
|
||||
--
|
||||
1.6.6.2
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../etcnet/0004-do-not-add-dev-xxx-suffix-when-handling-special-route-types.patch
|
||||
# Copyright (C) 2010 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
From ed74dc8cb0ba0ecd95c75b57e1907ab8c44bb5ba Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Bolshakov <sbolshakov@altlinux.org>
|
||||
Date: Sun, 17 Jan 2010 21:18:17 +0300
|
||||
Subject: [PATCH 4/4] do not add 'dev xxx' suffix when handling special route types
|
||||
|
||||
---
|
||||
etc/net/scripts/functions-ipv4 | 4 +++-
|
||||
1 files changed, 3 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/etc/net/scripts/functions-ipv4 b/etc/net/scripts/functions-ipv4
|
||||
index 5379c68..51625ab 100644
|
||||
--- a/etc/net/scripts/functions-ipv4
|
||||
+++ b/etc/net/scripts/functions-ipv4
|
||||
@@ -157,7 +157,9 @@ config_ipv4_routes_rules()
|
||||
while read FIRST REST; do
|
||||
# If 'dev' is not specified, add current dev.
|
||||
SUFFIX=''
|
||||
- echo "$FIRST $REST" | egrep -q '[[:space:]]dev[[:space:]]' || SUFFIX="dev $NAME"
|
||||
+ if ! echo "$FIRST $REST" | egrep -q '(^|[[:space:]])(throw|unreachable|prohibit|blackhole)[[:space:]]'; then
|
||||
+ echo "$FIRST $REST" | egrep -q '[[:space:]]dev[[:space:]]' || SUFFIX="dev $NAME"
|
||||
+ fi
|
||||
# If operation is not specified, use 'append'.
|
||||
case "$FIRST" in
|
||||
add|change|append|replace)
|
||||
--
|
||||
1.6.6.2
|
||||
|
||||
Loading…
Reference in new issue