Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/core/34/filelists/files b/config/rootfiles/core/34/filelists/files
index 0037af183326a74f3cbb5f65b2cf4c007eea7bed..4da209c457698cc1b7d937bf068dce5b37aed8e1 100644 (file)
--- a/config/rootfiles/core/34/filelists/files
+++ b/config/rootfiles/core/34/filelists/files
@@ -1 +1,2 @@
 etc/system-release
+etc/rc.d/init.d/networking/red

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index b694a3c04e8f62c149d32bb9c4e87eb2b447081c..f24bdb3a065fcac22cface8ba4b9d505742ffb5e 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -568,7 +568,7 @@ case "${1}" in
                                if echo "${link_status}" | grep -q UP; then
                                        boot_mesg "Bringing down the ${DEVICE}.${RED_VDSL_INET_VLAN} interface..."
                                        ip link set ${DEVICE}.${RED_VDSL_INET_VLAN} down
-                                       vconfig del ${DEVICE} ${RED_VDSL_INET_VLAN}
+                                       vconfig rem ${DEVICE}.${RED_VDSL_INET_VLAN}
                                        evaluate_retval
                                fi
                        else