diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
| commit | 58d6937e71aea203f6693a68146018f950922fbc (patch) | |
| tree | 3b53b76f930f60717debca5e0d612eeab0279b39 /extra/kexec-tools/kexec | |
| parent | d07d53d7af1e9694d9558783841bc2df3124a90f (diff) | |
| parent | f651180e6b1ac9508ec0d1d9b94972de776020a9 (diff) | |
I don't understand gcc/PKGBUILD.mips64el
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/addresses/PKGBUILD
community/chmsee/PKGBUILD
community/coin/PKGBUILD
community/critterding/PKGBUILD
community/distcc/PKGBUILD
community/djview4/PKGBUILD
community/freedroid/PKGBUILD
community/gnumail/PKGBUILD
community/gyachi/PKGBUILD
community/java-oracle/PKGBUILD
community/liboop/PKGBUILD
community/ltris/PKGBUILD
community/nepim/PKGBUILD
community/pantomime/PKGBUILD
community/pyxattr/PKGBUILD
community/soqt/PKGBUILD
community/tilda/PKGBUILD
community/unrealircd/PKGBUILD
community/uqm/PKGBUILD
core/dnsutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
core/vpnc/PKGBUILD
extra/apache/PKGBUILD
extra/bind/PKGBUILD
extra/bzflag/PKGBUILD
extra/ccache/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/cups/PKGBUILD
extra/doxygen/PKGBUILD
extra/fam/PKGBUILD
extra/fcitx/PKGBUILD
extra/gdk-pixbuf2/PKGBUILD
extra/geoip/PKGBUILD
extra/gtk2/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/libffi/PKGBUILD
extra/libfwbuilder/PKGBUILD
extra/libmpd/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt/PKGBUILD
extra/samba/PKGBUILD
extra/wireshark/PKGBUILD
extra/xulrunner/PKGBUILD
multilib-testing/lib32-keyutils/PKGBUILD
multilib-testing/lib32-udev/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dash/PKGBUILD
testing/libssh2/PKGBUILD
Diffstat (limited to 'extra/kexec-tools/kexec')
| -rwxr-xr-x | extra/kexec-tools/kexec | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/kexec-tools/kexec b/extra/kexec-tools/kexec index bef5b5ef3..c2e9a78a8 100755 --- a/extra/kexec-tools/kexec +++ b/extra/kexec-tools/kexec @@ -7,19 +7,19 @@ case "$1" in start) - stat_busy "Enabled loading kernel for Kexec into running kernel on reboot" + stat_busy "Enabling kexec on reboot" add_daemon kexec stat_done ;; stop|load) if [ "$RUNLEVEL" = "6" -o "$1" = "load" ]; then - stat_busy "Loading kernel for Kexec into running kernel" + stat_busy "Loading kexec kernel" [ -f "$KPATH" ] || stat_fail [ -f "$INITRD" ] && _INITRD="--initrd=$INITRD" /sbin/kexec -l $KPATH --append="root=$ROOTPART $KPARAM" $_INITRD > /dev/null 2>&1 else - stat_busy "Skipping loading kernel for Kexec into running kernel" + stat_busy "Disabling kexec on reboot" fi if [ $? -eq 0 ] ; then rm_daemon kexec @@ -30,7 +30,7 @@ case "$1" in ;; unload) - stat_busy "Unloading Kexec kernel from running kernel" + stat_busy "Unloading kexec kernel" /sbin/kexec -u if [ $? -eq 0 ] ; then stat_done |