diff options
| author | Paľo Šimo <palo.simo@gmail.com> | 2008-03-11 15:38:41 +0000 |
|---|---|---|
| committer | Paľo Šimo <palo.simo@gmail.com> | 2008-03-11 15:38:41 +0000 |
| commit | 4e4b74429cd870cd471a2e2167c8c4efa97c3e94 (patch) | |
| tree | 7aa6d633b5d6d5fe9a8f2c5e8c477151864a8fce /rc.d | |
| parent | 2157fe0d07796e3ca101d94bfed59cbb13b9e525 (diff) | |
| parent | 6cc0dede699e7505e832988bfb8229bf78399289 (diff) | |
| download | initscripts-4e4b74429cd870cd471a2e2167c8c4efa97c3e94.tar initscripts-4e4b74429cd870cd471a2e2167c8c4efa97c3e94.tar.gz initscripts-4e4b74429cd870cd471a2e2167c8c4efa97c3e94.tar.bz2 initscripts-4e4b74429cd870cd471a2e2167c8c4efa97c3e94.tar.xz initscripts-4e4b74429cd870cd471a2e2167c8c4efa97c3e94.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/initscripts
Diffstat (limited to 'rc.d')
| -rwxr-xr-x | rc.d/init.d/network | 2 | ||||
| -rwxr-xr-x | rc.d/rc | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 78370f9e..b1b15592 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -2,7 +2,7 @@ # # network Bring up/down networking # -# chkconfig: 2345 10 90 +# chkconfig: - 10 90 # description: Activates/Deactivates all network interfaces configured to \ # start at boot time. # @@ -37,7 +37,8 @@ do_confirm="no" if [ -f /var/run/confirm ]; then do_confirm="yes" fi - +UPSTART= +[ -x /sbin/initctl ] && UPSTART=yes # See if we want to be in user confirmation mode if [ "$previous" = "N" ]; then if [ "$do_confirm" = "yes" ]; then @@ -70,7 +71,9 @@ for i in /etc/rc$runlevel.d/K* ; do check_runlevel "$i" || continue # Bring the subsystem down. + [ -n "$UPSTART" ] && initctl emit --quiet "stopping $subsys" $i stop + [ -n "$UPSTART" ] && initctl emit --quiet "stopped $subsys" done # Now run the START scripts. @@ -97,11 +100,13 @@ for i in /etc/rc$runlevel.d/S* ; do update_boot_stage "$subsys" # Bring the subsystem up. + [ -n "$UPSTART" ] && initctl emit --quiet "starting $subsys" if [ "$subsys" = "halt" -o "$subsys" = "reboot" ]; then export LC_ALL=C exec $i start fi $i start + [ -n "$UPSTART" ] && initctl emit --quiet "started $subsys" done [ "$do_confirm" = "yes" ] && rm -f /var/run/confirm if [ "$GRAPHICAL" = "yes" ]; then |