diff options
author | Joerg Schirottke <master@kanotix.com> | 2014-06-25 00:44:28 +0200 |
---|---|---|
committer | Holger Paradies <retabell@gmx.de> | 2014-09-10 23:11:25 +0200 |
commit | 703ab2a890d3b7ae3122c0fd04ef4777237f7bbd (patch) | |
tree | ed72b9dcaf0e3b8a1df32440fde797026a695fe8 /backend/modules/hdmap | |
parent | c2363714af5fb68650451f8e6d55b76a20950419 (diff) | |
download | acritoxinstaller-703ab2a890d3b7ae3122c0fd04ef4777237f7bbd.zip acritoxinstaller-703ab2a890d3b7ae3122c0fd04ef4777237f7bbd.tar.gz |
btrfs fixes and lzo support
Diffstat (limited to 'backend/modules/hdmap')
-rw-r--r-- | backend/modules/hdmap | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/backend/modules/hdmap b/backend/modules/hdmap index ee447b4..ed872bf 100644 --- a/backend/modules/hdmap +++ b/backend/modules/hdmap @@ -246,15 +246,23 @@ function prepare_partitions_for_install() emit_progress 0 local progress_steps=$(( $(wc -l <<<"$cfg_hdmap") )) local progress=0 + local mountoptions="" while IFS=: read device mountpoint filesystem automount do [ -z "$mountpoint" ] && continue [ "$1" != "--nomount" ] && umount_all_affected $device - + + mountoptions="" + if [ "$filesystem" = "btrfs-lzo" ]; then + filesystem="btrfs" + mountoptions="-o compress=lzo" + fi + # format device with filesystem (if specified) if [ "$filesystem" ]; then + wipefs -a $device # clean all old signatures dd if=/dev/zero of=$device bs=1k count=16 >/dev/null 2>/dev/null # shutup! :-) TMP=/tmp/mkfs.$$ @@ -296,7 +304,7 @@ function prepare_partitions_for_install() # (or 4. the mountpoint is a special one that always should be mounted [/boot/efi]) if [ "$automount" = "auto" -a "$1" != "--nomount" ] && [ -d "/live/filesystem$mountpoint" -o "$mountpoint" = "/boot/efi" ]; then # mount device to mountpoint - EC="$(LC_ALL=C mount $device ${TARGET}${mountpoint} 2>&1)" + EC="$(LC_ALL=C mount $mountoptions $device ${TARGET}${mountpoint} 2>&1)" if (($?)); then case "$EC" in "*already mounted*") # then let's try "mount --bind" |