aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/init.d/network
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'initscripts-9.41-1' into mga-41Colin Guthrie2012-10-281-28/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Drop more unused functions, and drop old s-c-n profile support directories.Bill Nottingham2012-08-061-10/+0
| | | | | | | | The profile support itself was removed a while ago.
| * Tweak wording.Bill Nottingham2012-04-231-1/+1
| |
| * Drop net-tools requirement; check for /sbin/route before calling legacy ↵Bill Nottingham2012-04-201-3/+7
| | | | | | | | static-route support. (#682308)
| * Make sure there's no headings in the findmnt output.Bill Nottingham2012-03-091-1/+1
| |
| * Add cifs to check for network filesystem (#760018).Bill Nottingham2011-12-141-4/+2
| | | | | | | | Use findmnt to simplify the code.
* | remove mandriva-clean-var-run-lock systemd service, unneded now that ↵Olivier Blin2012-10-231-11/+0
| | | | | | | | /var/lock is a symlink to /run/lock
* | network: Deal with ifcfg-* file that have spaces in them.Colin Guthrie2012-04-101-10/+11
| | | | | | | | | | | | This can happen on the ifcfg-Auto* files created by NM. It may be more sensible overall to just skip such files, but incase any other invalid files are found, they are now simply skipped to avoid errors.
* | network: Remove old service names from LSB headersColin Guthrie2012-04-061-2/+2
| |
* | network: Write a flag that can be used as a trigger for udevColin Guthrie2012-04-061-0/+12
| | | | | | | | | | | | | | | | | | | | | | udev might detect network interfaces that in turn check to see if the network subsystem is ready. It did this via checking a file in /var/lock, but this is not a good idea if that file system tree is messy from a previous boot. The (separate) cleaning process has to run after udev (because udev may be needed to mount /var filesystem) and thus we have to use a different flag until /var/lock is on a tmpfs.
* | Make network and network-up start after NetworkManager should it be enabled.Colin Guthrie2012-03-261-4/+1
| | | | | | | | | | | | | | | | | | | | Both scripts will check to see if NetworkManager is running before deciding to ignore interfaces. This directive will ensure that systemd starts NetworkManager before running these scripts and thus any checks and probes will be valid. This should prevent the double running of wpa_supplicant if the network script was run before NetworkManager which can cause constant disconnects.
* | Also ignore the TYPE=Wireless when shutting down interfaces.Colin Guthrie2012-03-251-0/+4
| | | | | | | | This just mirrors 8f85566feeb57e8385c7e024cdde021e3f041bc2
* | Ignore 'Wireless' network config files.Colin Guthrie2012-03-181-1/+4
| | | | | | | | | | | | | | | | | | Network manager does not write SLAVE=yes, but they are effectively slave connections. We should not start these interfaces directly. Also use /bin/ls directly to avoid any aliasing (not that this should be an issue in a script context)
* | Merge commit 'initscripts-9.34-1' into mga-34Colin Guthrie2011-11-031-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Be less picky about ifcfg file names. (#742276)Bill Nottingham2011-09-301-2/+2
| |
| * VLAN, etc. interfaces can be slaves; check for being a slave first. (#703475)Bill Nottingham2011-05-121-4/+4
| |
| * Use LC_ALL=C when calling sed. ↵Bill Nottingham2011-05-101-3/+3
| | | | | | | | (https://bugs.mageia.org/show_bug.cgi?id=1216, via <sander.lepik@eesti.ee>)
| * Use net_log where appropriate.Bill Nottingham2011-03-251-1/+1
| |
| * Move sysctl.conf/sysctl.d handling to a function, call it where appropriate. ↵Bill Nottingham2011-02-281-2/+2
| | | | | | | | (#593211, continued)
* | Replace LANG with LC_ALLThomas Backlund2011-10-221-3/+3
| | | | | | | | https://bugs.mageia.org/show_bug.cgi?id=1216
* | Add the mdkconf patchColin Guthrie2011-10-211-20/+70
|/
* add # as a valid character in network device namesMatt Domsch2010-12-171-1/+1
|
* Remove extraneous newline.Bill Nottingham2010-05-201-1/+0
|
* use ip command for vlan instead of vconfigPetr Lautrbach2010-05-131-7/+1
|
* Only blacklist the original loopback interface. (#579816, <evgsyr@gmail.com>)Bill Nottingham2010-04-061-1/+2
|
* Don't quote regex argument to bash's =~.Ville Skyttä2010-01-251-1/+1
|
* Eliminate bunch of unnecessary stat calls and command invocations.Ville Skyttä2010-01-121-1/+1
|
* Get rid of uses of deprecated egrep and fgrep.Ville Skyttä2010-01-121-7/+7
|
* Simplify various string match constructs.Ville Skyttä2010-01-071-1/+1
|
* We don't echo when we *set* forwarding; there's no reason to echo when we ↵Bill Nottingham2010-01-061-7/+1
| | | | disable it either. (#552653)
* ip_always_defrag was removed in the *2.4* kernel.Bill Nottingham2010-01-061-5/+0
| | | | I think we can safely remove this code.
* Keep error codes limited to '1'. (#537841)Bill Nottingham2009-11-171-3/+3
|
* More random return code fixes.Bill Nottingham2009-09-291-1/+2
|
* Various initscript guideline fixes. (#524489)Bill Nottingham2009-09-211-3/+5
|
* Don't call a function that doesn't actually do anything.Bill Nottingham2009-08-211-5/+0
|
* Use $() instead of `` for process expansion.Bill Nottingham2009-07-301-6/+6
| | | | Adapted from <victor.lowther@gmail.com>.
* Use a leading path marker when sourcing files. (#482826)Bill Nottingham2009-01-281-1/+1
| | | | bash 4 breaks the prior code.
* Bring up ipsec interfaces last. (#481733)Bill Nottingham2009-01-271-8/+16
|
* Return success/failure correctly from start/stop. (#480677)Bill Nottingham2009-01-201-1/+7
|
* Tweak return codes (#242912)Bill Nottingham2008-11-261-2/+2
| | | | We'll see what breaks.
* Add some LSB description stuff. (#225900)Bill Nottingham2008-09-301-0/+2
|
* https://bugzilla.redhat.com/show_bug.cgi?id=433702Harald Hoyer2008-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to init scripts to better support stateless: --rc.sysinit-- - don't update mtab in a r/o root - mount on sys and /dev/pts returns EBUSY on a readonly root - [ -n $CLIENTSTATE ] is always returning true, causing an unnecessary timeout --network-- - /etc/mtab may not have any mount information in the readonly-root cause, but the root mount is likely to be a network mount. Without this, nfs hangs the reboot process. --halt-- - don't try and update a read-only mtab --rwtab-- - /var/empty/sshd/etc/localtime needs to be overwritten by sshd at startup - /var/lib/random-seed is written to at shutdown; this fixes the error but doesn't return the functionality lost in a r/o /var/lib.
* Disable by default in favor of NetworkManager.Bill Nottingham2008-03-101-1/+1
|
* Skip network shutdown if there is a '_rnetdev' root device (part of #435358, ↵Bill Nottingham2008-03-031-1/+1
| | | | <pjones@redhat.com>)
* more fixes (#220087)Bill Nottingham2007-09-251-1/+1
|
* add Should-Start for firewall servicesBill Nottingham2007-09-191-0/+1
|
* remove NETWORKING_IPV6Bill Nottingham2007-01-171-16/+8
|
* support VLAN_PLUS_VID_NO_PAD devices (#222975, #223011)Bill Nottingham2007-01-171-2/+2
|
* pass path to '.' always (#206035)Bill Nottingham2006-09-111-1/+1
|
* simpify (based on a prodding from <oblin@mandriva.com>)Bill Nottingham2006-08-251-1/+1
|
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-22 12:25:05 +0000