summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMarco Amadori <marco.amadori@gmail.com>2009-06-19 01:12:57 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:05 +0100
commit52575f3515b9a6a86a358238cf687a26ad799414 (patch)
treeebef5e27d2c12bc15f84a9902eb9f2e1429e6183 /bin
parent6bfb8618efc674689166fde07cf4faa711247c2a (diff)
downloadlive-boot-52575f3515b9a6a86a358238cf687a26ad799414.tar.gz
live-boot-52575f3515b9a6a86a358238cf687a26ad799414.zip
Removed two bashisms on live-snapshot.
* Thanks to Luigi Capriotti <l.capriotti@xbmc.org> for pointing this out.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/live-snapshot4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/live-snapshot b/bin/live-snapshot
index bf63041..18b067b 100755
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -238,7 +238,7 @@ Defaults ()
# Parse resync string
if [ -n "${SNAP_RESYNC_STRING}" ]
then
- SNAP_COW=$(echo "${SNAP_RESYNC_STRING/\/root/${DEF_SNAP_COW}}" | cut -f1 -d ':')
+ SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | sed -e 's|^/root\([^:.]*\).*$|'"${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}"
@@ -362,7 +362,7 @@ Do_filelist ()
if [ -f "${SNAP_LIST}" ]
then
# if SNAP_COW == /live/cow/home, SNAP_RW = /home
- SNAP_RW="${SNAP_COW/${DEF_SNAP_COW}}"
+ SNAP_RW=$(echo "${SNAP_COW}" | sed -e "s|${DEF_SNAP_COW}||g")
if [ -z "${SNAP_RW}" ]
then
SNAP_RW="/"