|
Line
Link Here
|
| 0 |
-- ../splashutils-gentoo-0.5.1/splash-functions.sh |
0 |
++ splash-functions.sh |
|
Lines 61-70
Link Here
|
| 61 |
|
61 |
|
| 62 |
local args=($@) |
62 |
local args=($@) |
| 63 |
|
63 |
|
| 64 |
if [[ ${event} == "rc_init" || ${event} == "rc_exit" ]]; then |
|
|
| 65 |
args[${#args[*]}]="${RUNLEVEL}" |
| 66 |
fi |
| 67 |
|
| 68 |
splash_profile "pre ${event} ${args[*]}" |
64 |
splash_profile "pre ${event} ${args[*]}" |
| 69 |
|
65 |
|
| 70 |
# Handle -pre event hooks |
66 |
# Handle -pre event hooks |
|
Lines 79-86
Link Here
|
| 79 |
svc_stopped) splash_svc "$1" "$2" "stop";; |
75 |
svc_stopped) splash_svc "$1" "$2" "stop";; |
| 80 |
svc_input_begin) splash_input_begin "$1";; |
76 |
svc_input_begin) splash_input_begin "$1";; |
| 81 |
svc_input_end) splash_input_end "$1";; |
77 |
svc_input_end) splash_input_end "$1";; |
| 82 |
rc_init) splash_init "$1" "${RUNLEVEL}";; |
78 |
rc_init) splash_init "$1";; |
| 83 |
rc_exit) splash_exit "${RUNLEVEL}";; |
79 |
rc_exit) splash_exit ;; |
| 84 |
critical) splash_verbose;; |
80 |
critical) splash_verbose;; |
| 85 |
esac |
81 |
esac |
| 86 |
|
82 |
|
|
Lines 197-203
Link Here
|
| 197 |
# Make sure the splash daemon is really dead (just in case the killall |
193 |
# Make sure the splash daemon is really dead (just in case the killall |
| 198 |
# in splash_cache_cleanup didn't get executed). This should fix Gentoo |
194 |
# in splash_cache_cleanup didn't get executed). This should fix Gentoo |
| 199 |
# bug #96697. |
195 |
# bug #96697. |
| 200 |
killall -9 splash_util.static >/dev/null 2>/dev/null |
196 |
start-stop-daemon --quiet --stop --exec "${spl_util}" --pidfile "${spl_pidfile}" |
|
|
197 |
rm -f "${spl_pidfile}" |
| 201 |
} |
198 |
} |
| 202 |
|
199 |
|
| 203 |
splash_start() { |
200 |
splash_start() { |
|
Lines 243-250
Link Here
|
| 243 |
umount ${spl_tmpdir} |
240 |
umount ${spl_tmpdir} |
| 244 |
fi |
241 |
fi |
| 245 |
|
242 |
|
| 246 |
# In the unlikely case that there's a splash daemon running -- kill it. |
243 |
start-stop-daemon --quiet --stop --exec "${spl_util}" --pidfile "${spl_pidfile}" |
| 247 |
killall -9 ${spl_util##*/} 2>/dev/null |
244 |
rm -f "${spl_pidfile}" |
| 248 |
|
245 |
|
| 249 |
# Prepare the communications FIFO |
246 |
# Prepare the communications FIFO |
| 250 |
mkfifo ${spl_fifo} |
247 |
mkfifo ${spl_fifo} |
|
Lines 522-529
Link Here
|
| 522 |
|
519 |
|
| 523 |
|
520 |
|
| 524 |
splash_cache_cleanup() { |
521 |
splash_cache_cleanup() { |
| 525 |
# FIXME: Make sure the splash daemon is dead. |
522 |
# Make sure the splash daemon is dead. |
| 526 |
killall -9 splash_util.static >/dev/null 2>/dev/null |
523 |
start-stop-daemon --quiet --stop --exec "${spl_util}" --pidfile "${spl_pidfile}" |
|
|
524 |
rm -f "${spl_pidfile}" |
| 527 |
|
525 |
|
| 528 |
# There's no point in saving all the data if we're running off a livecd. |
526 |
# There's no point in saving all the data if we're running off a livecd. |
| 529 |
if [[ -n "${CDBOOT}" ]]; then |
527 |
if [[ -n "${CDBOOT}" ]]; then |
