diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-03-02 10:44:10 +0100 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-03-02 10:44:10 +0100 |
commit | 38e09f4b2ad2d389a2abbbc0d76a88c82ff50db0 (patch) | |
tree | 0dc2bf7febacc6bc28b289bd31f5a3ccf10f4894 | |
parent | Use $* instead of $@ in echo (diff) | |
download | ctmg-38e09f4b2ad2d389a2abbbc0d76a88c82ff50db0.tar.xz ctmg-38e09f4b2ad2d389a2abbbc0d76a88c82ff50db0.zip |
Support non root user and quote variable
-rwxr-xr-x | ctmg.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -95,9 +95,9 @@ cmd_new() { rm -f "$container_path" trace truncate -s "$container_size" "$container_path" || { trace rm -f "$container_path"; die "Could not create $container_path"; } trace cryptsetup --cipher aes-xts-plain64 --key-size 512 --hash sha512 --iter-time 5000 --batch-mode luksFormat "$container_path" || { trace rm -f "$container_path"; die "Could not create LUKS volume on $container_path"; } - trace chown ${SUDO_UID:-0}:${SUDO_GID:-0} "$container_path" || { trace rm -f "$container_path"; die "Could not set ownership of $container_path"; } + trace chown "${SUDO_UID:-$(id -u)}:${SUDO_GID:-$(id -g)}" "$container_path" || { trace rm -f "$container_path"; die "Could not set ownership of $container_path"; } trace cryptsetup luksOpen "$container_path" "$mapper_name" || { trace rm -f "$container_path"; die "Could not open LUKS volume at $container_path"; } - trace mkfs.ext4 -q -E root_owner=${SUDO_UID:-0}:${SUDO_GID:-0} "$mapper_path" || { trace rm -f "$container_path"; die "Could not format ext4 on the LUKS volume at $container_path"; } + trace mkfs.ext4 -q -E root_owner="${SUDO_UID:-$(id -u)}:${SUDO_GID:-$(id -g)}" "$mapper_path" || { trace rm -f "$container_path"; die "Could not format ext4 on the LUKS volume at $container_path"; } echo "[+] Created new encrypted container at $container_path" } |