aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig.txt
Commit message (Collapse)AuthorAgeFilesLines
* Fix up mismerge in sysconfig documentationColin Guthrie2012-10-291-30/+5
|
* Merge tag 'initscripts-9.41-1' into mga-41Colin Guthrie2012-10-281-17/+36
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 prefdm.Bill Nottingham2012-08-081-11/+0
| |
| * Clarify docs around IPV6INIT=yes/noBill Nottingham2012-06-291-15/+5
| |
| * Move VLAN= docs to the interface configuration section, rather than ↵Bill Nottingham2012-06-081-1/+1
| | | | | | | | /etc/sysconfig/network.
| * Update docs to not reference ifconfig.Bill Nottingham2012-04-111-1/+1
| |
| * Add support for firewalld zones. (#802415, from <jpopelka@redhat.com>)Bill Nottingham2012-03-131-0/+4
| | | | | | | | | | | | | | | | | | | | ZONE in an ifcfg file describes the zone an interface should belong to. Zones can be configured in the firewalld configuration file. When interfaces are brought up, tell firewalld, if running, to add them to the proper zone. Similarly, remove them when they're brought down. Modified from a patch from Jiri Popelka.
| * Clean up BOOTPROTO docs.Bill Nottingham2012-03-131-5/+6
| |
| * Clean up IPv6 disable docs some.Bill Nottingham2012-02-101-6/+3
| |
| * Document the additional ETHTOOL_OPTS enhancementsRaghu Udiyar2012-01-251-0/+3
| |
* | Merge commit 'initscripts-9.34-1' into mga-34Colin Guthrie2011-11-031-8/+38
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * If locale.conf exists, use it. (#706756, in part)Bill Nottingham2011-10-251-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | systemd's algorithm on startup is: - if /etc/locale.conf is parseable, use that - otherwise, use /etc/sysconfig/i18n Given that we have a heirarchy of system -> user settings here, simply go: ~/.i18n > /etc/locale.conf > /etc/sysconfig/i18n Add some documentation as well.
| * Add support for setting random bridge options via BRIDGING_OPTS. (#734045, ↵Bill Nottingham2011-08-311-0/+8
| | | | | | | | #665378)
| * Support overriding hostname via /etc/hostname.Bill Nottingham2011-04-181-0/+1
| |
| * Document NM_CONTROLLED. (#692123)Bill Nottingham2011-03-301-0/+3
| |
| * Update and improve IPv6 disabling instructions.Ville Skyttä2011-03-011-3/+6
| |
| * Add GVRP support (#597598, <tomek@jot23.org>)Bill Nottingham2011-02-281-0/+3
| |
* | Apply Mageia branding patchColin Guthrie2011-10-211-3/+3
| |
* | Add the mdkconf patchColin Guthrie2011-10-211-45/+120
|/
* Support multiple IP addreses via IPADDRn, PREFIXn (or NETMASKn) (#633984) ↵Bill Nottingham2010-11-301-5/+9
| | | | | | | | Adapted from <jklimes@redhat.com> In addition to legacy IP aliases, this commit adds a support for configuring mupliple IPs via single ifcfg file. It uses the same syntax and behaviour as NetworkManager.
* Adjust clock docs (#637058)Bill Nottingham2010-09-271-13/+9
|
* Document PREFIX/NETMASK (#617481, <jklimes@redhat.com>)Bill Nottingham2010-07-261-0/+6
|
* Document NETWORKWAIT (#595386)Bill Nottingham2010-07-011-0/+8
|
* Tweak wording.Bill Nottingham2010-06-291-1/+1
|
* Mention WDM, though (#609037)Bill Nottingham2010-06-291-1/+1
|
* Document that DISPLAYMANAGER is deprecated.Bill Nottingham2010-06-291-3/+7
|
* Remove obsolete documentation (we don't support dhcpcd.)Bill Nottingham2010-06-241-7/+1
|
* Clean up some leftover VLAN code; clarify documentation.Bill Nottingham2010-05-131-1/+1
|
* use ip command for vlan instead of vconfigPetr Lautrbach2010-05-131-2/+1
|
* Document DHCLIENTARGS.Bill Nottingham2010-02-161-0/+2
|
* Run '/sbin/dhclient -6' instead of /sbin/dhcp6c (#553017, ↵Bill Nottingham2010-01-081-3/+3
| | | | | | | | <dcantrell@redhat.com>) The ISC software is now used for DHCPv6 support, so run dhclient in DHCPv6 mode instead of the older /sbin/dhcp6c program. Still honor the same configuration variables.
* ip_always_defrag was removed in the *2.4* kernel.Bill Nottingham2010-01-061-6/+0
| | | | I think we can safely remove this code.
* Coalesce the multiple rcX and ttyX jobs into single files.Bill Nottingham2009-12-031-0/+3
| | | | | | Adjust other jobs accordingly. Use a configuration parameter for what ttys to start.
* Remove deprecation for older route syntax.Bill Nottingham2009-11-121-2/+2
|
* Doucment DHCP_HOSTNAME (#498052)Bill Nottingham2009-09-021-0/+2
|
* Clarify docs. (#518614)Bill Nottingham2009-08-211-2/+2
|
* Allow use of either ESP only or AH only (#251494, <stijn.tintel@x-tend.be>)Bill Nottingham2009-03-201-0/+2
|
* Allow passing of arguments to dhcp6c (#437949, <pekkas@netcore.fi>)Bill Nottingham2009-03-201-0/+4
|
* Add support for creating TUN/TAP devices on the fly (#453973, <scott@zahna.com>)Bill Nottingham2009-03-191-0/+3
|
* Document CGROUP_DAEMONBill Nottingham2009-03-091-0/+10
|
* Remove support for no longer existing 'brctl setgcint' command. (#360471)Bill Nottingham2008-11-261-1/+0
|
* Add some docs on BONDING_OPTS.Bill Nottingham2008-11-211-0/+5
|
* note that ETHTOOL_OPTS really should be done as udev rulesBill Nottingham2008-04-241-6/+10
|
* add support for overriding IKE dh group (#251506, <stijn.tintel@x-tend.be>)Bill Nottingham2007-08-091-1/+2
|
* clarify ipv6 noteBill Nottingham2007-04-161-1/+3
|
* allow overriding of my_identifier (#229343, <cmadams@hiwaay.net>)Bill Nottingham2007-04-161-0/+5
|
* disable link checking when PERSISTENT_DHCLIENT is set (#234075)Bill Nottingham2007-04-161-1/+2
|
* remove NETWORKING_IPV6Bill Nottingham2007-01-171-3/+4
|
* - add bridging docs (#221412, <markmc@redhat.com>)Bill Nottingham2007-01-041-0/+6
|
* Add a way to manually manage racoon.conf, e.g. to handle separate tunnels withMiloslav Trmac2006-11-151-0/+4
| | | | a shared peer endpoint (#159343)
generated by cgit v1.2.1 (git 2.21.0) at 2024-10-05 14:45:05 +0000