aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'initscripts-9.41-1' into mga-41Colin Guthrie2012-10-28155-99891/+25256
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * 9.41-1initscripts-9.41-1Bill Nottingham2012-10-051-1/+9
| |
| * Clena out some obsolete requirements.Bill Nottingham2012-10-031-4/+3
| |
| * MALLOC_CHECK_ is not thread safe. Don't enable it by default even in debug ↵Bill Nottingham2012-09-251-1/+2
| | | | | | | | mode. (#853175)
| * Don't suggest modifying the packaged files.Bill Nottingham2012-09-142-10/+6
| |
| * Enable 256 color terminals by defaultPádraig Brady2012-09-143-0/+56
| |
| * Be less strict about VLAN name (#505314)Václav Pavlín2012-09-051-4/+1
| |
| * Add explicit requirement on hostname (#851688)Bill Nottingham2012-08-241-0/+1
| |
| * Drop prefdm.Bill Nottingham2012-08-084-67/+0
| |
| * Allow duplicate address dectection to be disabledBenjamin Coddington2012-08-072-1/+8
| |
| * Killproc -d should parse same values as sleepLukas Nykryn2012-08-071-2/+6
| |
| * Fix typo in help message in ifdown-routesLukas Nykryn2012-08-071-1/+1
| |
| * Process rule6-* for sit devices (#840009)Lukas Nykryn2012-08-072-6/+5
| |
| * 9.40-1initscripts-9.40-1Bill Nottingham2012-08-061-1/+5
| |
| * Drop more unused functions, and drop old s-c-n profile support directories.Bill Nottingham2012-08-064-56/+0
| | | | | | | | The profile support itself was removed a while ago.
| * Remove more now-unused functions from init.d/functions (crypto/dm)Bill Nottingham2012-08-061-180/+0
| |
| * Drop fstab-decode and getkey; no longer used.Bill Nottingham2012-08-067-428/+1
| | | | | | | | Drop the umount loop from rc.d/init.d/functions.
| * Drop testd test sysv script.Bill Nottingham2012-08-063-60/+1
| |
| * Drop net.hotplugBill Nottingham2012-08-064-63/+0
| |
| * Initial removal of support for non-systemd systems.Bill Nottingham2012-08-0632-2277/+18
| |
| * Use /lib/tmpfiles.d, not /etc/tmpfiles.d (#840182)Bill Nottingham2012-07-162-4/+4
| |
| * Drop reference to systemd-udev.service.Bill Nottingham2012-07-091-1/+1
| | | | | | | | | | 1) udev-settle.service brings it in anyway 2) it changed names again
| * 9.39-1initscripts-9.39-1Bill Nottingham2012-06-292-3/+2
| |
| * Tx updatesBill Nottingham2012-06-293-816/+838
| |
| * Fix clashing definitions.Bill Nottingham2012-06-2969-345/+69
| |
| * Fix unit names.initscripts-9.38-1Bill Nottingham2012-06-291-2/+2
| |
| * Bump releaseBill Nottingham2012-06-291-1/+11
| |
| * Clarify docs around IPV6INIT=yes/noBill Nottingham2012-06-291-15/+5
| |
| * Drop crypttab man page (it's in systemd now)Bill Nottingham2012-06-271-132/+0
| |
| * Spelling fixes.Ville Skyttä2012-06-2773-77/+77
| |
| * Ignore *.mo.Ville Skyttä2012-06-271-0/+1
| |
| * Sync FSF address with current GPLv2.Ville Skyttä2012-06-2714-30/+30
| |
| * Bump /sbin/service version.Bill Nottingham2012-06-261-1/+1
| |
| * service: add support for legacy custom actionsMichal Schmidt2012-06-263-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for legacy initscript actions such as service iptables save Packages wishing to provide legacy actions should install programs (probably scripts, but could be binaries) named /usr/libexec/initscripts/legacy-actions/<service>/<action> It should be emphasized that this feature is meant to be used only in packages where compatibility of custom actions with previous releases is desired. Adding of entirely new actions is discouraged. Useful tools should be shipped by upstreams as programs in /usr/bin, not in distro-specific hacks. [ Modifications from original : change from /usr/lib to /usr/libexec - notting ] https://bugzilla.redhat.com/show_bug.cgi?id=796663
| * Handle (improper) quoted HWADDR (#835372)Bill Nottingham2012-06-261-1/+1
| |
| * Echo to stderr in a bit more standard fashion. (#832220)Bill Nottingham2012-06-211-1/+1
| |
| * Only run fedora-storage-init if we have the tools that it invokes.Bill Nottingham2012-06-192-0/+6
| |
| * Check that root is r/w before starting fedora-import-state.Bill Nottingham2012-06-191-0/+1
| |
| * Allow bridge names starting with a dashDan Kenigsberg2012-06-132-7/+7
| | | | | | | | | | | | | | | | Misguided people may name their bridge '-foo', with a leading dash. Let us indulge them. It is better than showing the usage string of brctl. Signed-off-by: Dan Kenigsberg <danken@redhat.com>
| * Move VLAN= docs to the interface configuration section, rather than ↵Bill Nottingham2012-06-081-1/+1
| | | | | | | | /etc/sysconfig/network.
| * Don't accidentally match other bonding devices. (#824175)Bill Nottingham2012-05-232-2/+2
| |
| * Clean up some requirements.Bill Nottingham2012-05-161-5/+3
| |
| * Move fedora-readonly to Before=local-fs.targetBill Nottingham2012-05-071-1/+1
| |
| * check_device_down: Don't bother calling ip to check link state if the device ↵Bill Nottingham2012-05-021-0/+1
| | | | | | | | doesn't exist.
| * Rename internal tracking variable USE_NM to _use_nm, to more clearly state ↵Bill Nottingham2012-04-303-4/+4
| | | | | | | | it's not for configuration use.
| * Make sure fedora-readonly runs before random seed loading/saving. (#808907)Bill Nottingham2012-04-251-1/+1
| |
| * securetty: check if the device is in the file before attempting to write to itBill Nottingham2012-04-241-21/+37
| | | | | | | | This avoids spurious failures on RO root systems.
| * Allow dhclient configuration files for DHCPv6 as well. (#815676)Bill Nottingham2012-04-242-10/+14
| |
| * Tweak wording.Bill Nottingham2012-04-231-1/+1
| |
| * Remove conflicts that predate roughly RHEL 6.Bill Nottingham2012-04-201-14/+0
| |
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-22 18:18:32 +0000