summaryrefslogtreecommitdiffstats
path: root/helper
diff options
context:
space:
mode:
authorroot2014-07-24 23:26:00 +0200
committerroot2014-07-24 23:26:00 +0200
commitec9fb42e19ed245baf9915f7da9209253ffbec98 (patch)
treeffb011af7e836669a6f98a5c11a0c06233901f3a /helper
parent[kernel] Remove set -x call (diff)
downloadtm-scripts-ec9fb42e19ed245baf9915f7da9209253ffbec98.tar.gz
tm-scripts-ec9fb42e19ed245baf9915f7da9209253ffbec98.tar.xz
tm-scripts-ec9fb42e19ed245baf9915f7da9209253ffbec98.zip
Keep split usr if original system has it, add extra logic if no split usr
Diffstat (limited to 'helper')
-rw-r--r--helper/fileutil.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/helper/fileutil.inc b/helper/fileutil.inc
index 525e46a7..10b4bbc7 100644
--- a/helper/fileutil.inc
+++ b/helper/fileutil.inc
@@ -23,7 +23,9 @@ tarcopy () {
[ -z "$TO" ] && perror "tarcopy called with empty destination."
[ ! -d "$TO" ] && { mkdir -p "$TO" || perror "could not create destination "$TO" for tar-copy."; }
# TODO count files copied? would remove the need to do it everywhere :)
- tar $IGNORE_ERROR -cpP $FROM | tar -xp -C "$TO" 2> /dev/null
+ tar $IGNORE_ERROR -cpP $FROM | tar -xp -C "$TO" \
+ --transform 's,^/lib/udev/rules.d,/usr/lib/udev/rules.d,' \
+ 2> /dev/null
local PS=(${PIPESTATUS[*]})
[ "x$IGNORE_ERROR" == "x" -a "x${PS[0]}" != "x0" ] && perror "packing-part of tar-copy from '$SHORT' to '$TO' failed. (${PS[0]})"
[ "x${PS[1]}" != "x0" ] && perror "unpacking-part of tar-copy from '$SHORT' to '$TO' failed. (${PS[1]})"