summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2014-04-25 21:12:53 +0200
committerDaniel Baumann <mail@daniel-baumann.ch>2014-04-26 08:05:29 +0200
commit1867dc1e5296852f55132e0799b037dc2fc72d1a (patch)
tree6ba4a5c71564498bee7f03ca66f932e37cac56d9
parentd86fb1aeb4cb09a39f518cae3073c5ea509802ee (diff)
downloadvyos-live-build-1867dc1e5296852f55132e0799b037dc2fc72d1a.tar.gz
vyos-live-build-1867dc1e5296852f55132e0799b037dc2fc72d1a.zip
Using cp -a on all non-fat filesystems to copy content into the binary image (Closes: #745824).
-rwxr-xr-xscripts/build/binary_hdd8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index 5fd745d65..e335a81b7 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -239,13 +239,17 @@ esac
case "${LB_BINARY_FILESYSTEM}" in
fat*)
- CP_OPTIONS="-L"
+ CP_OPTIONS="-r -L"
+ ;;
+
+ *)
+ CP_OPTIONS="-a"
;;
esac
mkdir -p chroot/binary.tmp
mount ${MOUNT_OPTIONS} ${FREELO} chroot/binary.tmp
-cp -r -T ${CP_OPTIONS} binary/ chroot/binary.tmp
+cp -T ${CP_OPTIONS} binary/ chroot/binary.tmp
FIXME()
{