diff options
| author | Marco Amadori <amadorim@vdavda.com> | 2010-09-07 17:38:27 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:54:16 +0100 |
| commit | 8705e0f269bf7e592c32d835ac6685612fb39ad3 (patch) | |
| tree | 20a231066cd8a1af02d1a2eed57d5fe00478368f /bin | |
| parent | f5761134d90fafddba5a506475558409eb97c908 (diff) | |
| download | live-boot-8705e0f269bf7e592c32d835ac6685612fb39ad3.tar.gz live-boot-8705e0f269bf7e592c32d835ac6685612fb39ad3.zip | |
Fix snapshots' sync-strings usage (Closes: #591330).
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/live-snapshot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/live-snapshot b/bin/live-snapshot index 08e5fd6..991e704 100755 --- a/bin/live-snapshot +++ b/bin/live-snapshot @@ -7,7 +7,7 @@ # for reuse in another live-boot session. # Look at the manpage for more informations. # -# Copyright (C) 2006-2008 Marco Amadori <marco.amadori@gmail.com> +# Copyright (C) 2006-2010 Marco Amadori <marco.amadori@gmail.com> # Copyright (C) 2008 Chris Lamb <chris@chris-lamb.co.uk> # # This program is free software: you can redistribute it and/or modify @@ -39,7 +39,7 @@ fi . /usr/share/initramfs-tools/scripts/live-helpers -LIVE_CONF="/etc/live.conf" +LIVE_CONF="/etc/live/boot.d/snapshot.conf" if [ -r "${LIVE_CONF}" ] then @@ -242,7 +242,7 @@ Defaults () # Parse resync string if [ -n "${SNAP_RESYNC_STRING}" ] then - SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | sed -e 's|^/root\([^:.]*\).*$|'"${DEF_SNAP_COW}"'\1|') + SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | sed -r -e 's#^([^:]*).*$#'"${DEF_SNAP_COW}"'\1#') SNAP_DEV=$(echo "${SNAP_RESYNC_STRING}" | cut -f2 -d ':') SNAP_MNT=$(echo "${SNAP_RESYNC_STRING}" | cut -f3 -d ':') DEST="${MOUNTP}/${SNAP_MNT}" |