diff options
| author | Colin Guthrie <colin@mageia.org> | 2016-06-07 17:28:01 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2016-06-07 17:28:01 +0100 |
| commit | b53d95939e513b135b688548e8b587129ac683dd (patch) | |
| tree | 7b5aea6656107fafe96382217323d18df5090454 /sysconfig.txt | |
| parent | 08eee6c0c91bcff0c401a12fd7b640a1831408ba (diff) | |
| parent | 3a01f26785ca58a4c50648dbaccaf5ddbd61e028 (diff) | |
| download | initscripts-b53d95939e513b135b688548e8b587129ac683dd.tar initscripts-b53d95939e513b135b688548e8b587129ac683dd.tar.gz initscripts-b53d95939e513b135b688548e8b587129ac683dd.tar.bz2 initscripts-b53d95939e513b135b688548e8b587129ac683dd.tar.xz initscripts-b53d95939e513b135b688548e8b587129ac683dd.zip | |
Merge tag 'initscripts-9.66-1' into distro/mga
Tag as initscripts-9.66-1
Conflicts:
service
sysconfig/network-scripts/ifup-wireless
Notes:
The 'service' wrapper was kept as the Mageia version.
We should look into moving this over to the upstream version
although some people will likely complain at syntax changes.
ifup-wireless was also kept as Mageia version. The changes
introduced downstream in the past are complex and we cannot
easily merge in the upstream changes. We should try to move
away from this. Most users should use network manager but for
those using these legacy scripts we should at least try and use
e.g. iw rather than the legacy iwconfig utilities.
Diffstat (limited to 'sysconfig.txt')
| -rw-r--r-- | sysconfig.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sysconfig.txt b/sysconfig.txt index 72e48eda..56cde1b7 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -835,6 +835,8 @@ Files in /etc/sysconfig/network-scripts/ PPPOPTIONS=<arbitrary option string; is placed last on the command line, so it can override other options like asyncmap that were specified differently> + PPPOE_EXTRA = any extra arguments to pass to pppoe + PPPD_EXTRA = any extra arguments to pass to pppd PAPNAME=<"name $PAPNAME" on pppd command line> (note that the "remotename" option is always specified as the logical ppp device name, like "ppp0" (which might perhaps be the |