diff options
| author | Yuval Adam <yuval@y3xz.com> | 2015-01-13 16:06:51 +0200 |
|---|---|---|
| committer | Yuval Adam <yuval@y3xz.com> | 2015-01-13 16:06:51 +0200 |
| commit | 63913a155c0403cc279133f68097f64ff15cb8f9 (patch) | |
| tree | c6f95df9792721c91e34b494d8f3a1bc7e7ea5d5 | |
| parent | efd007c7059d14bbb971c66b849af8f19f5f733e (diff) | |
| parent | 0e8e0316e459187dd2d7ce125bb6570e9f738af6 (diff) | |
Implements passphrase generation (instead using fixed password)
| -rwxr-xr-x | liveusb/build.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/liveusb/build.sh b/liveusb/build.sh index 3a1dca9..52a3f73 100755 --- a/liveusb/build.sh +++ b/liveusb/build.sh @@ -10,6 +10,7 @@ arch=$(uname -m) work_dir=work encrypt_dir=encrypt out_dir=out +passphrase=$(cat /dev/urandom | tr -dc _A-Z-a-z-0-9_\?\! | head -c20) # args testing=false @@ -77,8 +78,8 @@ make_encrypted_device() { # Setup dd if=/dev/zero of=${work_dir}/airootfs/encrypted bs=1K count=${_cryptsize} losetup ${_loopdev} ${work_dir}/airootfs/encrypted - echo -n "passphrase" | cryptsetup luksFormat ${_loopdev} - - echo -n "passphrase" | cryptsetup open ${_loopdev} cryptloop --key-file - + echo -n ${passphrase} | cryptsetup luksFormat ${_loopdev} - + echo -n ${passphrase} | cryptsetup open ${_loopdev} cryptloop --key-file - mkfs.ext4 /dev/mapper/cryptloop # Mount and copy @@ -137,6 +138,11 @@ make_iso() { mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${arch}.iso" } +# Output generated passphrase +output_passphrase() { + echo "[amenthes] INFO: Password for encrypted container: ${passphrase}" +} + (pacman -Qq archiso > /dev/null) || (echo "This script requires archiso(-git) to be installed"; _usage 1) if [[ ${EUID} -ne 0 ]]; then echo "This script must be run as root." @@ -171,3 +177,4 @@ run_once make_syslinux run_once make_isolinux run_once make_prepare run_once make_iso +run_once output_passphrase |