summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMarco Amadori <amadorim@vdavda.com>2010-09-07 17:38:27 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:54:16 +0100
commit8705e0f269bf7e592c32d835ac6685612fb39ad3 (patch)
tree20a231066cd8a1af02d1a2eed57d5fe00478368f /debian
parentf5761134d90fafddba5a506475558409eb97c908 (diff)
downloadlive-boot-8705e0f269bf7e592c32d835ac6685612fb39ad3.tar.gz
live-boot-8705e0f269bf7e592c32d835ac6685612fb39ad3.zip
Fix snapshots' sync-strings usage (Closes: #591330).
Diffstat (limited to 'debian')
-rw-r--r--debian/live-boot.init5
1 files changed, 3 insertions, 2 deletions
diff --git a/debian/live-boot.init b/debian/live-boot.init
index 548abca..6c3e665 100644
--- 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
+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
-# 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