alex/crypt-mounts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add mount timeout option and add sudo variable

Browse Source
This commit is contained in:
Alexandre CATTEAU 2023-07-27 16:21:25 +02:00
parent 3fcffac8fb
commit 14a205d6a2
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
install.sh
View File

@ -7,6 +7,12 @@ if [ -f $run_directory/.disabled ]; then
exit 0 exit 0
fi fi
if [[ $user != 'root' ]]; then
sudo="sudo"
else
sudo=""
fi
echo "Copying Systemd units to system directory..." echo "Copying Systemd units to system directory..."
for f in $run_directory/mounts.conf.d/*.conf; do for f in $run_directory/mounts.conf.d/*.conf; do
if [ ! -e "$f" ]; then if [ ! -e "$f" ]; then
@ -15,25 +21,33 @@ for f in $run_directory/mounts.conf.d/*.conf; do
source $f source $f
mountfile=$(echo ${mount[target]} | sed -e "s:/:-:g") mountfile=$(echo ${mount[target]} | sed -e "s:/:-:g")
mountfile=${mountfile:1}.mount mountfile=${mountfile:1}.mount
sudo cp $run_directory/template.mount /etc/systemd/system/$mountfile $sudo cp $run_directory/template.mount /etc/systemd/system/$mountfile
sudo sed -i -e "s/PH_MAPPER/${mount[mapper]}/g" /etc/systemd/system/$mountfile $sudo sed -i -e "s/PH_MAPPER/${mount[mapper]}/g" /etc/systemd/system/$mountfile
sudo sed -i -e "s:PH_TARGET:${mount[target]}:g" /etc/systemd/system/$mountfile $sudo sed -i -e "s:PH_TARGET:${mount[target]}:g" /etc/systemd/system/$mountfile
if [ "${mount[friendly]}" != '' ]; then if [ "${mount[friendly]}" != '' ]; then
sudo sed -i -e "s/PH_FRIENDLY/${mount[friendly]}/g" /etc/systemd/system/$mountfile $sudo sed -i -e "s/PH_FRIENDLY/${mount[friendly]}/g" /etc/systemd/system/$mountfile
else else
sudo sed -i -e "s/PH_FRIENDLY/${mount[mapper]}/g" /etc/systemd/system/$mountfile $sudo sed -i -e "s/PH_FRIENDLY/${mount[mapper]}/g" /etc/systemd/system/$mountfile
fi fi
if [ ${mount[autolock]} -eq 1 ]; then if [ ${mount[autolock]} -eq 1 ]; then
sudo mkdir /etc/systemd/system/systemd-cryptsetup@${mount[mapper]}.service.d if [ ! -d /etc/systemd/system/systemd-cryptsetup@${mount[mapper]}.service.d ]; then
sudo cp $run_directory/close-vault.conf.template \ $sudo mkdir /etc/systemd/system/systemd-cryptsetup@${mount[mapper]}.service.d
fi
$sudo cp $run_directory/close-vault.conf.template \
/etc/systemd/system/systemd-cryptsetup@${mount[mapper]}.service.d/close-vault.conf /etc/systemd/system/systemd-cryptsetup@${mount[mapper]}.service.d/close-vault.conf
sudo sed -i -e "s/PH_MOUNTFILE/$mountfile/g" \ $sudo sed -i -e "s/PH_MOUNTFILE/$mountfile/g" \
/etc/systemd/system/systemd-cryptsetup@${mount[mapper]}.service.d/close-vault.conf /etc/systemd/system/systemd-cryptsetup@${mount[mapper]}.service.d/close-vault.conf
fi fi
if [ ${mount[timeout]} -eq 1 ]; then
if [ ! -d /etc/systemd/system/systemd-cryptsetup@${mount[mapper]}.service.d ]; then
$sudo mkdir /etc/systemd/system/systemd-cryptsetup@${mount[mapper]}.service.d
fi
$sudo cp $run_directory/timeout.conf /etc/systemd/system/systemd-cryptsetup@${mount[mapper]}.service.d/timeout.conf
fi
done done
echo "Reloading Systemd..." echo "Reloading Systemd..."
sudo systemctl daemon-reload $sudo systemctl daemon-reload
echo "Finished install. Exiting..." echo "Finished install. Exiting..."
exit 0 exit 0

1
mounts.conf.template
View File

@ -7,3 +7,4 @@ mount[mapper]='' # As in /dev/mapper/<?>
mount[target]='' # Mount point (absolute path) mount[target]='' # Mount point (absolute path)
mount[friendly]='' # Optional friendly name for unit file Description mount[friendly]='' # Optional friendly name for unit file Description
mount[autolock]=0 # Set to 1 to enable autolock mount[autolock]=0 # Set to 1 to enable autolock
mount[timeout]=0 # Set to 1 to enable mount timeout (30 seconds)

2
timeout.conf Normal file
View File

@ -0,0 +1,2 @@
[Unit]
JobTimeoutSec=30