projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing overzealous blacklist usage.
[live-boot-grml.git]
/
debian
/
live-boot.init
diff --git
a/debian/live-boot.init
b/debian/live-boot.init
index
298295d
..
63b07f0
100644
(file)
--- a/
debian/live-boot.init
+++ b/
debian/live-boot.init
@@
-2,12
+2,12
@@
### BEGIN INIT INFO
# Provides: live-boot
### BEGIN INIT INFO
# Provides: live-boot
-# Required-Start: $syslog
+# Required-Start: $syslog
bootmisc
# Required-Stop:
# Should-Start: $local_fs
# Should-Stop: halt reboot
# X-Stop-After: umountroot
# Required-Stop:
# Should-Start: $local_fs
# Should-Stop: halt reboot
# X-Stop-After: umountroot
-# Default-Start:
+# Default-Start:
S
# Default-Stop: 0 6
# Short-Description: live-boot init script
# Description: Resyncs snapshots, evantually caches files in order to
# Default-Stop: 0 6
# Short-Description: live-boot init script
# Description: Resyncs snapshots, evantually caches files in order to
@@
-21,15
+21,13
@@
PATH=/usr/sbin:/usr/bin:/sbin:/bin
NAME=live-boot
SCRIPTNAME=/etc/init.d/${NAME}
DO_SNAPSHOT=/sbin/live-snapshot
NAME=live-boot
SCRIPTNAME=/etc/init.d/${NAME}
DO_SNAPSHOT=/sbin/live-snapshot
+SNAPSHOT_CONF="/etc/live/boot.d/snapshot.conf"
# Exit if system was not booted by live-boot
grep -qs boot=live /proc/cmdline || exit 0
# Exit if system was not booted by live-boot
grep -qs boot=live /proc/cmdline || exit 0
-# Exit if the system was booted from an ISO image rather than a physical CD
-grep -qs find_iso= /proc/cmdline && exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/live.conf ] && . /etc/live.conf
+# Read snapshot configuration variables
+[ -r ${SNAPSHOT_CONF} ] && . ${SNAPSHOT_CONF}
# Load the VERBOSE setting and other rcS variables
[ -f /etc/default/rcS ] && . /etc/default/rcS
# Load the VERBOSE setting and other rcS variables
[ -f /etc/default/rcS ] && . /etc/default/rcS
@@
-51,7
+49,7
@@
cache_path()
then
if [ -x "${path}" ]
then
then
if [ -x "${path}" ]
then
- if file "${path}" | grep -q 'dynamically linked'
+ if file
-L
"${path}" | grep -q 'dynamically linked'
then
for lib in $(ldd "${path}" | awk '{ print $3 }')
do
then
for lib in $(ldd "${path}" | awk '{ print $3 }')
do
@@
-99,6
+97,7
@@
do_stop ()
{
if ! grep -qs nopersistent /proc/cmdline && grep -qs persistent /proc/cmdline
then
{
if ! grep -qs nopersistent /proc/cmdline && grep -qs persistent /proc/cmdline
then
+ # ROOTSNAP and HOMESNAP are defined in ${SNAPSHOT_CONF} file
if [ ! -z "${ROOTSNAP}" ]
then
${DO_SNAPSHOT} --resync-string="${ROOTSNAP}"
if [ ! -z "${ROOTSNAP}" ]
then
${DO_SNAPSHOT} --resync-string="${ROOTSNAP}"
@@
-137,7
+136,7
@@
do_stop ()
prompt=
fi
prompt=
fi
- for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth
/sbin/usplash_write
+ for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth
do
cache_path "${path}"
done
do
cache_path "${path}"
done
@@
-153,6
+152,9
@@
do_stop ()
if [ -z ${QUICKREBOOT} ]
then
if [ -z ${QUICKREBOOT} ]
then
+
+ # Exit if the system was booted from an ISO image rather than a physical CD
+ grep -qs find_iso= /proc/cmdline && return 0
# TODO: i18n
BOOT_DEVICE="$(get_boot_device)"
# TODO: i18n
BOOT_DEVICE="$(get_boot_device)"
@@
-185,13
+187,6
@@
do_stop ()
printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
- if [ -x /sbin/usplash_write ]
- then
- /sbin/usplash_write "TIMEOUT 86400"
- /sbin/usplash_write "TEXT-URGENT ${MESSAGE}"
- /sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
- fi
-
read x < /dev/console
fi
fi
read x < /dev/console
fi
fi
@@
-201,8
+196,15
@@
case "${1}" in
restart|reload|force-reload|status)
[ "${VERBOSE}" != no ] && log_end_msg 0
;;
restart|reload|force-reload|status)
[ "${VERBOSE}" != no ] && log_end_msg 0
;;
+ start)
+ log_begin_msg "${NAME} is configuring sendsigs..."
+ if [ -f /live/root.pid ] ; then
+ cat /live/root.pid >> /var/run/sendsigs.omit
+ fi
+ log_end_msg 0
+ ;;
- st
art|st
op)
+ stop)
log_begin_msg "${NAME} is resyncing snapshots and caching reboot files..."
do_stop
log_begin_msg "${NAME} is resyncing snapshots and caching reboot files..."
do_stop