keep up with 1.0.67 (#1464)

[Ventoy.git] / INSTALL / CreatePersistentImg.sh

diff --git a/INSTALL/CreatePersistentImg.sh b/INSTALL/CreatePersistentImg.sh
index 8a4480dbb8931921aea36a0e7a13cbbdc599563d..1dc90e6d2c5f74581ffe06fd791aaeedf2d8ea85 100644 (file)
--- a/INSTALL/CreatePersistentImg.sh
+++ b/INSTALL/CreatePersistentImg.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 size=1024
 fstype=ext4
@@ -7,13 +7,14 @@ config=''
 outputfile=persistence.dat
 
 print_usage() {
-    echo 'Usage:  CreatePersistentImg.sh [ -s size ] [ -t fstype ] [ -l LABEL ] [ -c CFG ]'
+    echo 'Usage:  sudo ./CreatePersistentImg.sh [ -s size ] [ -t fstype ] [ -l LABEL ] [ -c CFG ] [ -e ]'
     echo '  OPTION: (optional)'
     echo '   -s size in MB, default is 1024'
     echo '   -t filesystem type, default is ext4  ext2/ext3/ext4/xfs are supported now'
     echo '   -l label, default is casper-rw'
     echo '   -c configfile name inside the persistence file. File content is "/ union"'
     echo '   -o outputfile name, default is persistence.dat'
+    echo '   -e enable encryption, disabled by default (only few distros support this)'    
     echo ''
 }
 
@@ -33,6 +34,9 @@ while [ -n "$1" ]; do
     elif [ "$1" = "-o" ]; then
         shift
         outputfile=$1
+    elif [ "$1" = "-e" ]; then
+        read -s -p "Encryption passphrase: " passphrase
+        echo
     elif [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
         print_usage
         exit 0
@@ -52,10 +56,15 @@ fi
 
 # check size
 if echo $size | grep -q "^[0-9][0-9]*$"; then
-    if [ $size -le 1 ]; then
-        echo "Invalid size $size"
-        exit 1
+    vtMinSize=1
+    if echo $fstype | grep -q '^xfs$'; then
+        vtMinSize=16
     fi
+    
+    if [ $size -lt $vtMinSize ]; then
+        echo "size too small ($size)"
+        exit 1
+    fi    
 else
     echo "Invalid size $size"
     exit 1
@@ -86,6 +95,13 @@ freeloop=$(losetup -f)
 
 losetup $freeloop "$outputfile"
 
+if [ ! -z "$passphrase" ]; then
+    printf "$passphrase" | cryptsetup -q --verbose luksFormat $freeloop -
+    printf "$passphrase" | cryptsetup -q --verbose luksOpen $freeloop persist_decrypted -
+    _freeloop=$freeloop
+    freeloop="/dev/mapper/persist_decrypted"
+fi
+
 mkfs -t $fstype $fsopt -L $label $freeloop 
 
 sync
@@ -104,4 +120,9 @@ if [ -n "$config" ]; then
     rm -rf ./persist_tmp_mnt
 fi
 
+if [ ! -z "$passphrase" ]; then
+    cryptsetup luksClose $freeloop
+    freeloop=$_freeloop
+fi
+
 losetup -d $freeloop