OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

100 lines
3.4 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../etcnet/0002-redo-BOOTPROTO-separator-match-in-locale-insensitive.patch
  5. # Copyright (C) 2010 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. From 670cedacc62048bbfa8e46d58d27786d67170870 Mon Sep 17 00:00:00 2001
  17. From: Sergey Bolshakov <sbolshakov@altlinux.org>
  18. Date: Sun, 17 Jan 2010 17:52:03 +0300
  19. Subject: [PATCH 2/4] redo BOOTPROTO separator match in locale-insensitive manner
  20. ---
  21. etc/net/scripts/config-ipv4 | 6 +++---
  22. etc/net/scripts/ifdown | 4 ++--
  23. etc/net/scripts/ifdown-ifplugd | 2 +-
  24. etc/net/scripts/ifdown-removable | 2 +-
  25. 4 files changed, 7 insertions(+), 7 deletions(-)
  26. diff --git a/etc/net/scripts/config-ipv4 b/etc/net/scripts/config-ipv4
  27. index c4c0b9d..ce6dc0e 100755
  28. --- a/etc/net/scripts/config-ipv4
  29. +++ b/etc/net/scripts/config-ipv4
  30. @@ -33,13 +33,13 @@ case $ACTION in
  31. ipv4ll)
  32. try_ipv4ll && config_ipv4_routes_rules add
  33. ;;
  34. - dhcp[\ -,]static)
  35. + dhcp[-,\ ]static)
  36. try_dhcp || try_static && config_ipv4_routes_rules add
  37. ;;
  38. - dhcp[\ -,]ipv4ll)
  39. + dhcp[-,\ ]ipv4ll)
  40. try_dhcp || try_ipv4ll && config_ipv4_routes_rules add
  41. ;;
  42. - dhcp[\ -,]ipv4ll[\ -,]static)
  43. + dhcp[-,\ ]ipv4ll[-,\ ]static)
  44. try_dhcp || try_ipv4ll || try_static && config_ipv4_routes_rules add
  45. ;;
  46. *)
  47. diff --git a/etc/net/scripts/ifdown b/etc/net/scripts/ifdown
  48. index 60db2df..76ccac1 100755
  49. --- a/etc/net/scripts/ifdown
  50. +++ b/etc/net/scripts/ifdown
  51. @@ -59,7 +59,7 @@ xargise_file $MYIFACEDIR/ipneigh "$IP neigh del dev $NAME"
  52. # Look if there is DHCP agent hanging around.
  53. case "$BOOTPROTO" in
  54. - dhcp|dhcp[\ -,]static|dhcp[\ -,]ipv4ll|dhcp[\ -,]ipv4ll[\ -,]static)
  55. + dhcp|dhcp[-,\ ]static|dhcp[-,\ ]ipv4ll|dhcp[-,\ ]ipv4ll[-,\ ]static)
  56. stop_dhcp_client
  57. ;;
  58. *)
  59. @@ -68,7 +68,7 @@ esac
  60. # Kill ipv4ll agent, if any.
  61. case "$BOOTPROTO" in
  62. - ipv4ll|dhcp[\ -,]ipv4ll|dhcp[\ -,]ipv4ll[\ -,]static)
  63. + ipv4ll|dhcp[-,\ ]ipv4ll|dhcp[-,\ ]ipv4ll[-,\ ]static)
  64. stop_ipv4ll_client
  65. ;;
  66. *)
  67. diff --git a/etc/net/scripts/ifdown-ifplugd b/etc/net/scripts/ifdown-ifplugd
  68. index b03320b..86e9a05 100755
  69. --- a/etc/net/scripts/ifdown-ifplugd
  70. +++ b/etc/net/scripts/ifdown-ifplugd
  71. @@ -46,7 +46,7 @@ fi
  72. xargise_file $MYIFACEDIR/ipneigh "$IP neigh del dev $NAME"
  73. case "$BOOTPROTO" in
  74. - dhcp|dhcp[\ -,]static|dhcp[\ -,]ipv4ll[\ -,]static)
  75. + dhcp|dhcp[-,\ ]static|dhcp[-,\ ]ipv4ll[-,\ ]static)
  76. stop_dhcp_client
  77. ;;
  78. *)
  79. diff --git a/etc/net/scripts/ifdown-removable b/etc/net/scripts/ifdown-removable
  80. index cfe38a8..c631fab 100755
  81. --- a/etc/net/scripts/ifdown-removable
  82. +++ b/etc/net/scripts/ifdown-removable
  83. @@ -87,7 +87,7 @@ fi
  84. is_yes "$IFDOWN_CHILDREN" && ifdown_children
  85. xargise_file $MYIFACEDIR/ipneigh "$IP neigh del dev $NAME"
  86. case "$BOOTPROTO" in
  87. - dhcp|dhcp[\ -,]static|dhcp[\ -,]ipv4ll|dhcp[\ -,]ipv4ll[\ -,]static)
  88. + dhcp|dhcp[-,\ ]static|dhcp[-,\ ]ipv4ll|dhcp[-,\ ]ipv4ll[-,\ ]static)
  89. stop_dhcp_client
  90. ;;
  91. *)
  92. --
  93. 1.6.6.2