aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'initscripts-9.41-1' into mga-41Colin Guthrie2012-10-281-43/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Enable 256 color terminals by defaultPádraig Brady2012-09-141-0/+1
| |
| * Drop prefdm.Bill Nottingham2012-08-081-3/+0
| |
| * Drop more unused functions, and drop old s-c-n profile support directories.Bill Nottingham2012-08-061-8/+0
| | | | | | | | The profile support itself was removed a while ago.
| * Drop net.hotplugBill Nottingham2012-08-061-1/+0
| |
| * Initial removal of support for non-systemd systems.Bill Nottingham2012-08-061-27/+2
| |
| * Use /lib/tmpfiles.d, not /etc/tmpfiles.d (#840182)Bill Nottingham2012-07-161-2/+2
| |
| * 9.39-1initscripts-9.39-1Bill Nottingham2012-06-291-1/+0
| |
| * service: add support for legacy custom actionsMichal Schmidt2012-06-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Move default sysctl.conf to /usr/lib/sysctl.d, adjust things accordingly. ↵Bill Nottingham2012-04-201-3/+4
| | | | | | | | | | | | (#760254) Also, update apply_sysctl to 1) use systemd-sysctl if it's there 2) imitate it if it's not.
| * add fedora-import-state.serviceWill Woods2012-03-081-0/+1
| | | | | | | | | | | | | | | | This service imports the contents of /run/initramfs/state into the root filesystem, where the root filesystem is writeable. This allows dracut to hand the ifcfg file and dhclient lease over to NetworkManager on network-booted Live images.
* | remove mandriva-clean-var-run-lock systemd service, unneded now that ↵Olivier Blin2012-10-231-1/+0
| | | | | | | | /var/lock is a symlink to /run/lock
* | Add a simple message for systemd users when X11 fails to initialise.Colin Guthrie2012-03-081-0/+2
| | | | | | | | | | | | | | | | | | This system is rather crude and uses mingetty to ensure the tty is properly reset and initialised. A more complete solution would do all this internally and perhaps offer some options to e.g. enter the root password and automatically run drakx11. https://bugs.mageia.org/show_bug.cgi?id=4769
* | Merge commit 'initscripts-9.34-1' into mga-34Colin Guthrie2011-11-031-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 more verbose on make clean.Bill Nottingham2011-08-301-1/+1
| |
| * selinuxfs moved, adjust code. (#733759)Bill Nottingham2011-08-301-0/+1
| |
| * Drop fedora-autoswap; it's somewhat dangerous, and better done via a ↵Bill Nottingham2011-08-091-1/+0
| | | | | | | | udev/systemd combination anyway.
| * Remove fedora-sysinit-hack/fedora-sysinit-unhack; they're not needed with ↵Bill Nottingham2011-07-251-2/+0
| | | | | | | | /var/lock on tmpfs.
| * Make sure to enable fedora-storage-init-late.service, and have it after the ↵Bill Nottingham2011-04-271-0/+1
| | | | | | | | non-late version. (#699918)
| * separate "touch /.autorelabel" to a new unitMichal Schmidt2011-04-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Writing /.autorelabel from fedora-autorelabel does not work because the script is executed only if relabel was already requested. Create a new unit fedora-autorelabel-mark.service which will be responsible for creating /.autorelabel if SELinux is disabled. The unit takes advantage of the new "ConditionSecurity=" support in systemd. The old script checked for a read-only filesystem first. The new unit does not do that. If / is read-only, touch will simply fail. This should not be considered as a failure of the unit, so "-" is used in ExecStart. There have been arguments on systemd-devel that the root directory should not be abused for flag files like /.autorelabel. It has a long tradition in Fedora though (since 2005). Maybe we can change it eventually, but let's keep it where it is for now.
* | Add the mdkconf patchColin Guthrie2011-10-211-22/+26
|/
* Add tmpfiles.d support (#656602, <plautrba@redhat.com>)Bill Nottingham2010-11-301-0/+3
|
* Use systemd versions of these services.Bill Nottingham2010-10-281-3/+0
|
* Only pull in wait-storage by reference.Bill Nottingham2010-10-281-1/+0
|
* Add autorelabel service.Bill Nottingham2010-10-261-0/+1
|
* Drop fedora-mountall, fedora-cleanup. Adjust other services accordingly.Bill Nottingham2010-10-261-2/+0
| | | | systemd can do mount & fsck & quota, etc. now.
* Use systemd's support for normal swapon; only handle autoswap here.initscripts-9.21.systemd-1Bill Nottingham2010-10-151-1/+1
|
* Drop default.target here.Bill Nottingham2010-10-151-1/+0
|
* Set up the split-up boot services correctly.Bill Nottingham2010-10-151-1/+13
|
* Reorganize the systemd bits as we'll have scripts to put in /lib/systemd.Bill Nottingham2010-10-141-2/+2
|
* Revert "add systemd services"Bill Nottingham2010-10-141-4/+1
| | | | | | This reverts commit f280984f691e0c3cbca2b31dad7a32a5c66ab51b. This will be reworked a bit and re-added.
* add systemd servicesHarald Hoyer2010-10-051-1/+4
|
* Ship a default.target symlink in /lib, so we start with a valid fallback config.Bill Nottingham2010-09-141-0/+1
|
* prefdm, rc-local, ctrl-alt-del are system defaults. Don't package them ↵Bill Nottingham2010-09-071-3/+6
| | | | | | otherwise. (#630952) Notably, they cannot be enabled/disabled. They can be overriden via /etc/systemd/system.
* Add in basic systemd units.Bill Nottingham2010-09-031-4/+13
| | | | Factor out upstart/systemd/etc. support in the spec properly.
* Upload tarballs.Bill Nottingham2010-07-271-1/+5
|
* Don't use %dist for tagging.initscripts-9.04-1Bill Nottingham2010-01-151-1/+1
|
* Move to new upstart job location and file extension.Bill Nottingham2009-12-031-2/+2
|
* Fix typo.initscripts-8.98-1Bill Nottingham2009-09-021-1/+1
|
* Fix things so we don't build binaries on 'make archive'.Bill Nottingham2009-08-101-2/+5
|
* Add some simple regression tests for ipcalcBill Nottingham2009-07-291-0/+1
| | | | Adapted from tests from Matej Susta <msusta@redhat.com>.
* fix git commandsinitscripts-8.87-1Bill Nottingham2009-01-191-2/+2
|
* Don't use force-tag (accidental commit).Bill Nottingham2008-10-061-1/+1
|
* Fix one more % usage in the changelogBill Nottingham2008-09-301-1/+1
|
* Fix typo.initscripts-8.83-1Bill Nottingham2008-09-301-2/+2
|
* Fix permissions on /etc/init.d/functions.Bill Nottingham2008-09-301-0/+1
|
* Fix udev rule location in some more places.Bill Nottingham2008-09-301-1/+1
|
* Fix udev rule installation.Bill Nottingham2008-09-301-1/+1
|
* Ignore stuff in .git for 'make check'Bill Nottingham2008-09-301-1/+1
| | | | Not just because it's not what we're checking, but also because it fails the check.
* Move udev rules to /lib.Bill Nottingham2008-09-171-1/+3
|
generated by cgit v1.2.1 (git 2.21.0) at 2024-06-05 01:34:56 +0000