projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Releasing debian version 2.0.9-1.
[live-boot-grml.git]
/
debian
/
live-boot.init
diff --git
a/debian/live-boot.init
b/debian/live-boot.init
index
548abca
..
63b07f0
100644
(file)
--- a/
debian/live-boot.init
+++ b/
debian/live-boot.init
@@
-21,12
+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
-# 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
@@
-48,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
@@
-96,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}"