summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2013-03-13 22:07:05 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-05-06 14:50:07 +0200
commit17d85e14525ab2020515b1ae7eb39d358fad923a (patch)
tree864cf8d0d2653b068e4f7e2e6652d1e645985266 /scripts
parent157ba674785b2856a56dfe7a0aeff0b11538be35 (diff)
downloadvyos-live-build-17d85e14525ab2020515b1ae7eb39d358fad923a.tar.gz
vyos-live-build-17d85e14525ab2020515b1ae7eb39d358fad923a.zip
Using ntfs-3g to mount ntfs partitions.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/binary_hdd6
-rwxr-xr-xscripts/build/source_hdd6
2 files changed, 10 insertions, 2 deletions
diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index c5fdf70df..9f075212b 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -199,21 +199,25 @@ case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3|ext4)
MKFS="${LB_BINARY_FILESYSTEM}"
MKFS_OPTIONS="-L ${LB_HDD_LABEL} -m 0"
+ MOUNT_OPTIONS=""
;;
fat16)
MKFS="vfat"
MKFS_OPTIONS="-F 16 -n ${LB_HDD_LABEL}"
+ MOUNT_OPTIONS=""
;;
fat32)
MKFS="vfat"
MKFS_OPTIONS="-F 32 -n ${LB_HDD_LABEL}"
+ MOUNT_OPTIONS=""
;;
ntfs)
MKFS="ntfs"
MKFS_OPTIONS="-L ${LB_HDD_LABEL}"
+ MOUNT_OPTIONS="-t ntfs-3g"
;;
esac
@@ -234,7 +238,7 @@ case "${LB_BINARY_FILESYSTEM}" in
esac
mkdir -p chroot/binary.tmp
-mount ${FREELO} chroot/binary.tmp
+mount ${MOUNT_OPTIONS} ${FREELO} chroot/binary.tmp
cp -r -T ${CP_OPTIONS} binary/ chroot/binary.tmp
FIXME()
diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd
index 77b27f860..2bac010b7 100755
--- a/scripts/build/source_hdd
+++ b/scripts/build/source_hdd
@@ -105,28 +105,32 @@ case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3|ext4)
MKFS="${LB_BINARY_FILESYSTEM}"
MKFS_OPTIONS="-L ${LB_HDD_LABEL} -m 0"
+ MOUNT_OPTIONS=""
;;
fat16)
MKFS="vfat"
MKFS_OPTIONS="-F 16 -n ${LB_HDD_LABEL}"
+ MOUNT_OPTIONS=""
;;
fat32)
MKFS="vfat"
MKFS_OPTIONS="-F 32 -n ${LB_HDD_LABEL}"
+ MOUNT_OPTIONS=""
;;
ntfs)
MKFS="ntfs"
MKFS_OPTIONS="-L ${LB_HDD_LABEL}"
+ MOUNT_OPTIONS="-t ntfs-3g"
;;
esac
Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
mkdir -p source.tmp
-mount ${FREELO} source.tmp
+mount ${MOUNT_OPTIONS} ${FREELO} source.tmp
cp -r source/* source.tmp
umount source.tmp
rmdir source.tmp