| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Our initscripts vary quite different from Fedoras in that we will
actively start a wpa_supplicant daemon for wireless interfaces
As this can cause problems if the NM detection code is flaky
(which it is) we really do want to bail early when this is the case
https://bugs.mageia.org/show_bug.cgi?id=9028
|
|
|
|
| |
Originally by Colin Guthrie, but rewritten by me.
|
|
|
|
|
|
| |
drakx-net is listening for events coming from mageia.org
This should fix detection of connection success/failure in net_applet,
draknetcenter and drakroam.
|
|
|
|
|
|
|
|
|
| |
Also no need to shell out to logger as this is typically started by
systemd and thus any stderr output will end up in the journal (and
by extension syslog if it's installed).
Might help avoid numerous reports of the service 'failing' as
indicated in mga#8472.
|
|
|
|
|
|
| |
Only happens when /etc/rc.modules doesn't exist.
mga#7489
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| | |
|
| |
| |
| |
| | |
mode. (#853175)
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
The profile support itself was removed a while ago.
|
| | |
|
| |
| |
| |
| | |
Drop the umount loop from rc.d/init.d/functions.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
1) udev-settle.service brings it in anyway
2) it changed names again
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| | |
/etc/sysconfig/network.
|
| | |
|
| | |
|