diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2008-08-23 03:52:47 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2008-08-23 03:52:47 +0000 |
| commit | c2abedfbf6d1947d73a9f70d9d97c7bdebae258f (patch) | |
| tree | e45f140f640f5da737450c47bdbbef3f67cc37a3 /net-dialup/rp-pppoe/files | |
| parent | fix up metadata.xml (diff) | |
| download | gentoo-2-c2abedfbf6d1947d73a9f70d9d97c7bdebae258f.tar.gz gentoo-2-c2abedfbf6d1947d73a9f70d9d97c7bdebae258f.tar.bz2 gentoo-2-c2abedfbf6d1947d73a9f70d9d97c7bdebae258f.zip | |
Append $ETH to $PLUGIN_OPTS (#235369).
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-dialup/rp-pppoe/files')
| -rw-r--r-- | net-dialup/rp-pppoe/files/rp-pppoe-3.10-plugin-options.patch | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-plugin-options.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-plugin-options.patch index d1593392ba23..0d447748a1bc 100644 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-plugin-options.patch +++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-plugin-options.patch @@ -1,6 +1,6 @@ -diff -Nru rp-pppoe-3.10.orig/configs/pppoe.conf rp-pppoe-3.10/configs/pppoe.conf ---- rp-pppoe-3.10.orig/configs/pppoe.conf 2008-06-30 22:23:11.000000000 +0200 -+++ rp-pppoe-3.10/configs/pppoe.conf 2008-06-30 22:33:08.000000000 +0200 +diff -ur rp-pppoe-3.10.orig/configs/pppoe.conf rp-pppoe-3.10/configs/pppoe.conf +--- rp-pppoe-3.10.orig/configs/pppoe.conf 2008-08-23 03:40:56.000000000 +0000 ++++ rp-pppoe-3.10/configs/pppoe.conf 2008-08-23 03:42:20.000000000 +0000 @@ -120,7 +120,7 @@ FIREWALL=NONE @@ -10,10 +10,10 @@ diff -Nru rp-pppoe-3.10.orig/configs/pppoe.conf rp-pppoe-3.10/configs/pppoe.conf LINUX_PLUGIN= # Any extra arguments to pass to pppoe. Normally, use a blank string -diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-connect.in rp-pppoe-3.10/scripts/pppoe-connect.in ---- rp-pppoe-3.10.orig/scripts/pppoe-connect.in 2008-06-30 22:23:11.000000000 +0200 -+++ rp-pppoe-3.10/scripts/pppoe-connect.in 2008-06-30 22:33:08.000000000 +0200 -@@ -202,7 +202,7 @@ +diff -ur rp-pppoe-3.10.orig/scripts/pppoe-connect.in rp-pppoe-3.10/scripts/pppoe-connect.in +--- rp-pppoe-3.10.orig/scripts/pppoe-connect.in 2008-08-23 03:40:56.000000000 +0000 ++++ rp-pppoe-3.10/scripts/pppoe-connect.in 2008-08-23 03:45:43.000000000 +0000 +@@ -202,10 +202,13 @@ # If we're using kernel-mode PPPoE on Linux... if test "$LINUX_PLUGIN" != "" ; then @@ -22,7 +22,13 @@ diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-connect.in rp-pppoe-3.10/scripts/pppo if test -n "$SERVICENAME" ; then PLUGIN_OPTS="$PLUGIN_OPTS rp_pppoe_service $SERVICENAME" fi -@@ -297,7 +297,7 @@ ++ ++ # Interface name MUST BE LAST!! ++ PLUGIN_OPTS="$PLUGIN_OPTS $ETH" + modprobe pppoe > /dev/null 2>&1 + fi + +@@ -297,7 +300,7 @@ $SETSID $OVERRIDE_PPPD_COMMAND & echo "$!" > $PPPD_PIDFILE elif test "$LINUX_PLUGIN" != "" ; then |