aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'initscripts-9.41-1' into mga-41Colin Guthrie2012-10-2821-1043/+26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 fstab-decode and getkey; no longer used.Bill Nottingham2012-08-065-361/+1
| | | | | | | | Drop the umount loop from rc.d/init.d/functions.
| * Drop testd test sysv script.Bill Nottingham2012-08-063-60/+1
| |
| * Initial removal of support for non-systemd systems.Bill Nottingham2012-08-065-531/+1
| |
| * Sync FSF address with current GPLv2.Ville Skyttä2012-06-2713-28/+28
| |
| * 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.
| * rename_device: skip VLAN=yes configuration filesHarald Hoyer2011-11-021-1/+6
| |
* | Merge commit 'initscripts-9.34-1' into mga-34Colin Guthrie2011-11-031-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add freescale ttymx ports (#728730, <ndevos@redhat.com>)Bill Nottingham2011-08-081-0/+2
| |
* | Add the mdkconf patchColin Guthrie2011-10-213-7/+100
|/
* Fix OMAP patch (#678875)Bill Nottingham2011-02-231-1/+6
|
* Support OMAP serial consoles (#678875, <ndevos@redhat.com>)Bill Nottingham2011-02-211-0/+2
|
* rename_device: dequote DEVICE="eth0"Harald Hoyer2010-07-261-1/+1
|
* rename_device: fix s390 subchannel readingHarald Hoyer2010-07-151-3/+4
|
* Add sushell, man page to manifests.Bill Nottingham2010-06-291-0/+2
|
* Don't directly execute bash for single-user mode, as that has SELinux ↵Bill Nottingham2010-06-292-0/+21
| | | | | | | | | | | issues. (#540216, #584443, #585053) If upstart directly runs bash for single-user mode, there's no way for SELinux to set the proper context (to distinguish it from other init scripts). Inserting a helper binary in the way allows for this. While we're changing this, we make it configurable so it's easily possible for people to use sulogin if they so desire.
* Tweak manpage so it formats correctly (#586476)Bill Nottingham2010-04-271-1/+2
|
* Move ccw_init and ccw udev rules to s390utils. (#539491)Bill Nottingham2010-02-152-44/+0
|
* Add more man pages (#529328, <plautrba@redhat.com>)Bill Nottingham2010-01-073-0/+39
|
* License cleanup.Bill Nottingham2010-01-059-7/+41
|
* Remove kmodule.Bill Nottingham2010-01-051-3/+0
|
* Remove backup files on 'make clean'.Bill Nottingham2010-01-052-171/+1
|
* Merge branch 'upstart-0.6.0-branch'Bill Nottingham2009-12-091-2/+3
|\
| * fixed serial console handlingPetr Lautrbach2009-12-031-2/+3
| |
* | Remove more initlog references.Bill Nottingham2009-12-041-4/+0
| |
* | Remove very obsolete doexec.Bill Nottingham2009-12-044-40/+1
| | | | | | | | It was only ever used in the slip code, which has been removed.
* | Remove minilogd code as well.Bill Nottingham2009-12-042-195/+0
| |
* | Remove initlog code as well.Bill Nottingham2009-12-046-922/+0
|/
* Add initial ifup/ifdown man pages. (#529328, <plautrba@redhat.com>)Bill Nottingham2009-11-022-0/+38
|
* Remove long since deprecated initlog.Bill Nottingham2009-10-261-4/+1
|
* Move .cvsignore -> .gitignore.Bill Nottingham2009-10-201-0/+0
|
* Fix IPv6 address checking (#516319)Bill Nottingham2009-08-102-1/+2
|
* Remove very obsolete file.Bill Nottingham2009-07-291-40/+0
|
* Various ipdates to ipcalc to make it more useful.Victor Lowther2009-07-291-27/+42
| | | | | | | | 0 is a perfectly good prefix length. All the cool default routes use it. Autodetect if we are passed an IPv6 address and shift modes accordingly. Check prefixes as well as addresses when checking for validity.
* More tests.Bill Nottingham2009-07-291-0/+4
|
* More tests.Bill Nottingham2009-07-291-23/+30
|
* Add some simple regression tests for ipcalcBill Nottingham2009-07-292-0/+89
| | | | Adapted from tests from Matej Susta <msusta@redhat.com>.
* Expand get_hostname() function to support IPv4 and IPv6.David Cantrell2009-03-191-7/+29
| | | | | Make sure that get_hostname() if the user specifies either address family.
* Remove unnecessary tab.David Cantrell2009-03-191-1/+1
|
* Correct address family option handling in ipcalc.David Cantrell2009-03-191-42/+41
| | | | | Make sure the default is IPv4. If the check option is specified, make sure we just validate the address and return 1 or 0.
* Compile ipcalc with _GNU_SOURCE defined (for asprintf).David Cantrell2009-03-191-1/+1
|
* Man page updates for ipcalc(1)David Cantrell2009-03-192-7/+23
| | | | | Make sure the ipcalc man page explains the -c, -4, and -6 options. Update some other things. Shamelessly add my name.
* Add a address check capability for IPv4 and IPv6 addresses.David Cantrell2009-03-191-0/+42
| | | | | | | | | | | | | Add the -c, --check argument which enables address validation. The ipcalc program will exit with 0 if the address is valid or 1 if it is invalid, for the specified family. Add the -4, --ipv4 argument to specify the IPv4 address family. Add the -6, --ipv6 argument to specify the IPv6 address family. Ensure that the IPv6 family argument is invalid with the IPv4-only show arguments (broadcast, network, netmask, prefix).
* Use asprintf() rather than malloc() and sprintf().David Cantrell2009-03-191-3/+6
| | | | | Use asprintf() for conversion and abort on memory allocation failures.
* Use inet_ntop() and inet_pton()David Cantrell2009-03-191-5/+27
| | | | | The inet_ntoa() and inet_aton() functions are deprecated and limited to AF_INET only.
* Use 'struct in_addr' for IPv4 addresses.David Cantrell2009-03-191-44/+54
| | | | | Change from using uint32_t to struct in_addr for IPv4 addresses. Get rid of the IPBITS and IPBYTES macros.
* Whitespace cleanups for src/ipcalc.cDavid Cantrell2009-03-191-135/+130
| | | | Consistently use 4 spaces for indentation throughout ipcalc.c
* Add an option for consoletype to always return 0.Bill Nottingham2009-03-172-3/+8
| | | | | This allows tcsh -e to work, with lang.sh. It's a hack, but there really isn't a better way to solve it.
* loadkeys has a -q option for silent running. Use it.Bill Nottingham2009-02-261-6/+6
|
* Don't re-init an existing device, it causes errors. (#484411, ↵Bill Nottingham2009-02-061-1/+1
| | | | <jpayne@redhat.com>)
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-25 09:00:26 +0000