aboutsummaryrefslogtreecommitdiffstats
path: root/ppp
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'initscripts-9.50-1' into distro/mgauser/colin/update-to-9-50Colin Guthrie2013-10-181-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag as initscripts-9.50-1 Conflicts: Makefile lang.csh lang.sh po/Makefile rc.d/init.d/network service sysconfig.txt sysconfig/init sysconfig/network-scripts/ifup sysconfig/network-scripts/ifup-eth sysconfig/network-scripts/ifup-ippp sysconfig/network-scripts/network-functions sysctl.conf systemd/fedora-storage-init
| * consider IPV6INIT undefined as YESLukas Nykryn2013-07-291-3/+3
| |
* | Merge tag 'initscripts-9.41-1' into mga-41Colin Guthrie2012-10-281-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag as initscripts-9.41-1 Conflicts: .gitignore Makefile inittab po/xgettext_sh.py prefdm rc.d/init.d/functions rc.d/init.d/halt rc.d/init.d/killall rc.d/init.d/netfs rc.d/init.d/network rc.d/init.d/single rc.d/rc rc.d/rc.local rc.d/rc.sysinit service src/console_check.c src/console_init.c sysconfig.txt sysconfig/network-scripts/ifdown sysconfig/network-scripts/ifdown-eth sysconfig/network-scripts/ifup sysconfig/network-scripts/ifup-eth sysconfig/network-scripts/ifup-ippp sysconfig/network-scripts/network-functions systemd/system/fedora-wait-storage.service udev/rules.d/10-console.rules Merge Notes: 1. prefdm: We are keeping the current prefdm script which parses /etc/sysconfig/desktop to find the current preferred dm. We also keep the hunk in sysconfig.txt which relates to the afore mentioned file. Longer term, we should drop this and move to per-dm units. 2. sysconfig/network-scripts/ifup-ippp is still removed at our end... is there a replacement? 3. I used our /sbin/service as it varies quite a lot from fedora. I'd be tempted to drop our custom version in favour of upstream (s/libexec/lib/) 4. ifup/ifdown NM wrappers have been included - previously we just printed a "Device is manged by NM skipping.." message. CONFLICT (modify/delete): udev/rules.d/10-console.rules deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of udev/rules.d/10-console.rules left in tree. Auto-merging systemd/system/fedora-wait-storage.service CONFLICT (content): Merge conflict in systemd/system/fedora-wait-storage.service Auto-merging systemd/fedora-storage-init Auto-merging sysconfig/network-scripts/network-functions CONFLICT (content): Merge conflict in sysconfig/network-scripts/network-functions Removing sysconfig/network-scripts/net.hotplug Auto-merging sysconfig/network-scripts/ifup-sit Auto-merging sysconfig/network-scripts/ifup-post Auto-merging sysconfig/network-scripts/ifup-plusb CONFLICT (modify/delete): sysconfig/network-scripts/ifup-ippp deleted in HEAD and modified in initscripts-9.41-1. Version initscripts-9.41-1 of sysconfig/network-scripts/ifup-ippp left in tree. Auto-merging sysconfig/network-scripts/ifup-eth CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifup-eth Auto-merging sysconfig/network-scripts/ifup CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifup Auto-merging sysconfig/network-scripts/ifdown-sit Auto-merging sysconfig/network-scripts/ifdown-post Auto-merging sysconfig/network-scripts/ifdown-eth CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifdown-eth Auto-merging sysconfig/network-scripts/ifdown CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifdown Auto-merging sysconfig.txt CONFLICT (content): Merge conflict in sysconfig.txt Removing src/testdinit Removing src/testd.c Removing src/securetty.c Removing src/securetty.8 Removing src/getkey.c Removing src/getkey.1 Removing src/fstab-decode.c Removing src/fstab-decode.8 CONFLICT (modify/delete): src/console_init.c deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of src/console_init.c left in tree. CONFLICT (modify/delete): src/console_check.c deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of src/console_check.c left in tree. Auto-merging service CONFLICT (content): Merge conflict in service CONFLICT (modify/delete): rc.d/rc.sysinit deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc.sysinit left in tree. CONFLICT (modify/delete): rc.d/rc.local deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc.local left in tree. CONFLICT (modify/delete): rc.d/rc deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc left in tree. CONFLICT (modify/delete): rc.d/init.d/single deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/single left in tree. Auto-merging rc.d/init.d/network CONFLICT (content): Merge conflict in rc.d/init.d/network CONFLICT (modify/delete): rc.d/init.d/netfs deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/netfs left in tree. Auto-merging rc.d/init.d/netconsole CONFLICT (modify/delete): rc.d/init.d/killall deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/killall left in tree. CONFLICT (modify/delete): rc.d/init.d/halt deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/halt left in tree. Auto-merging rc.d/init.d/functions CONFLICT (content): Merge conflict in rc.d/init.d/functions CONFLICT (modify/delete): prefdm deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of prefdm left in tree. Auto-merging ppp/ip-up.ipv6to4 CONFLICT (modify/delete): po/xgettext_sh.py deleted in HEAD and modified in initscripts-9.41-1. Version initscripts-9.41-1 of po/xgettext_sh.py left in tree. Removing inittab.upstart Removing inittab.systemd Removing inittab.s390 Auto-merging inittab CONFLICT (content): Merge conflict in inittab Removing init/tty.conf Removing init/start-ttys.conf Removing init/splash-manager.conf Removing init/serial.conf Removing init/rcS.conf Removing init/rcS-sulogin.conf Removing init/rc.conf Removing init/quit-plymouth.conf Removing init/prefdm.conf Removing init/plymouth-shutdown.conf Removing init/control-alt-delete.conf Removing crypttab.5 Removing README-init Removing NetworkManager/dispatcher.d/05-netfs Auto-merging Makefile CONFLICT (content): Merge conflict in Makefile Auto-merging .gitignore CONFLICT (content): Merge conflict in .gitignore Automatic merge failed; fix conflicts and then commit the result.
| * Spelling fixes.Ville Skyttä2012-06-271-1/+1
| |
* | Merge commit 'initscripts-9.34-1' into mga-34Colin Guthrie2011-11-033-14/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings our fully patched initscripts branch up to version 9.34. Some code was not easily merged and thus not all functionality relating to multiple IP addresses per interface were merged in. Conflicts: Makefile lang.csh lang.sh prefdm rc.d/init.d/functions rc.d/init.d/netfs rc.d/init.d/network rc.d/rc rc.d/rc.local rc.d/rc.sysinit service sysconfig.txt sysconfig/network-scripts/ifdown-eth sysconfig/network-scripts/ifup-eth sysconfig/network-scripts/ifup-ipv6 sysconfig/network-scripts/ifup-sit sysconfig/network-scripts/ifup-tunnel sysconfig/network-scripts/network-functions systemd/system/fedora-sysinit-unhack.service
| * Use net_log where appropriate.Bill Nottingham2011-03-251-6/+6
| |
| * Drop some unnecessary command invocations.Ville Skyttä2011-02-283-8/+8
| |
* | Add the mdkconf patchColin Guthrie2011-10-214-2/+44
|/
* Don't use the /sbin/ip wrapper that was removed in mid-2009.Bill Nottingham2010-10-222-3/+3
|
* Remove ipv6_del_addr_on_device; adjust callers.Bill Nottingham2009-08-211-1/+1
|
* Remove ipv6_del_route; adjust callers.Bill Nottingham2009-08-211-1/+1
|
* Use $() instead of `` for process expansion.Bill Nottingham2009-07-302-12/+12
| | | | Adapted from <victor.lowther@gmail.com>.
* remove NETWORKING_IPV6Bill Nottingham2007-01-174-22/+0
|
* pass path to '.' always (#206035)Bill Nottingham2006-09-114-5/+5
|
* IPv6 updates (<pb@bieringer.de>, #143452)Bill Nottingham2006-08-023-18/+140
|
* Add support for rule-$device (#132252)Miloslav Trmac2006-07-101-1/+2
|
* Modify IPV6TO4_ROUTING to also add addresses on the interfacesMiloslav Trmac2006-05-142-41/+46
| | | | | Add RFC 3041 (IPv6 privacy) support (patch for both by Peter Bieringer <pb@bieringer.de>)
* Provide the underlying device name to ip-up (and thus ifup-routes) for PPPMiloslav Trmac2006-03-201-1/+1
| | | | devices (#92023)
* call ipv6to4 scripts in /etc/ppp/(ip-up|ip-down) (#124390, <dwmw2@redhat.com>)Bill Nottingham2004-10-172-0/+4
|
* add better fix to support nickname (#105785)Than Ngo2003-10-222-9/+2
|
* add support nickname (#105785)Than Ngo2003-10-222-2/+9
|
* beep? erhm, no. (#92019)Bill Nottingham2003-06-022-12/+0
|
* IPv6 updates <pekkas@netcore.fi>, <pb@bieringer.de>Bill Nottingham2003-01-071-1/+15
|
* IPv6 update (<pekkas@netcore.fi>, <pb@bieringer.de>)Bill Nottingham2002-12-021-2/+18
|
* IPv6 update <pekkas@netcore.fi>, <pb@bieringer.de>Bill Nottingham2002-11-124-43/+42
|
* - set PATH also in /etc/sysconfig/network-scripts/network-functionsFlorian La Roche2002-06-262-8/+6
|
* - useless space changesFlorian La Roche2002-06-264-34/+27
|
* IPv6 updates. <pekkas@netcore.fi>Bill Nottingham2002-03-211-4/+7
|
* *BIG* IPv6 syncup. <pekkas@netcore.fi>Bill Nottingham2002-03-114-85/+204
|
* ipv6 update (<pekkas@netcore.fi>)Bill Nottingham2001-07-242-19/+8
|
* big ipv6 update from Pekka Savola (<pekkas@netcore.fi>)Bill Nottingham2001-07-112-0/+265
|
* only run ifup-post if the ifcfg file is there (#19741)Bill Nottingham2000-12-261-1/+1
|
* export a ↵Bill Nottingham2000-12-261-0/+2
| | | | /usr/kerberos/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/local/bin:/opt/bin:/usr/X11R6/bin:/sbin:/usr/sbin:/home/notting/bin:/usr/X11R6/bin here too (#22784)
* move ip-up.local to after ifup-post, so that it has proper name resolution. ↵Bill Nottingham2000-07-121-5/+2
| | | | Also, kill unused hearbeat stuff.
* use $@ intead of $* to fix bug #9697Nalin Dahyabhai2000-03-102-3/+3
|
* first attempt at integrating ppp-watchMichael K. Johnson1999-09-071-3/+0
|
* added stuff for heartbeat monitoringBill Nottingham1999-07-261-0/+3
|
* let everyone read /var/run/ppp-*.devMichael K. Johnson1999-05-241-0/+2
|
* added path shit to ip-upDonnie Barnes1998-05-081-0/+2
|
* Initial revisionErik Troan1997-09-162-0/+27
generated by cgit v1.2.1 (git 2.21.0) at 2024-07-03 04:50:11 +0000