diff options
| author | Colin Guthrie <colin@mageia.org> | 2011-11-03 22:26:54 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-11-03 22:26:54 +0000 |
| commit | 1e6179bf54cbc84b4ad33480e7f2f713418bb28a (patch) | |
| tree | 794b2654be506d551421bcc47d3ad97822e2861c /rc.d/rc.local | |
| parent | 87589b49d1543595188dcb26aa5a09d33e5e0a4e (diff) | |
| parent | 6ce3e4700baa4e37e6b16e4160c00b2ebea58d81 (diff) | |
| download | initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar.gz initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar.bz2 initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar.xz initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.zip | |
Merge commit 'initscripts-9.34-1' into mga-34
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
Diffstat (limited to 'rc.d/rc.local')
| -rwxr-xr-x | rc.d/rc.local | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rc.d/rc.local b/rc.d/rc.local index 6d125d8b..cf1cf8dc 100755 --- a/rc.d/rc.local +++ b/rc.d/rc.local @@ -5,7 +5,7 @@ # X-Mandriva-Compat-Mode # Default-Start: 2 3 4 5 # Short-Description: Local initialization script -# Description: This script will be executed *after* all the other init scripts. +# Description: This script will be executed at the end of the boot process. # You can put your own initialization stuff in here if you don't # want to do the full Sys V style init stuff. ### END INIT INFO |