fix backup rm sequence

This commit is contained in:
Christopher Laprise 2019-08-13 14:46:03 -04:00
parent 8f8e7e6595
commit 876491ceee
No known key found for this signature in database
GPG Key ID: 448568C8B281C952

View File

@ -30,7 +30,6 @@ rwbak=$rw/vm-boot-protect
errlog=/var/run/vm-protect-error errlog=/var/run/vm-protect-error
servicedir=/var/run/qubes-service servicedir=/var/run/qubes-service
defdir=/etc/default/vms defdir=/etc/default/vms
save_backup=${save_backup:-1}
version="0.9.0b" version="0.9.0b"
# Define sh, bash, X and desktop init scripts in /home/user # Define sh, bash, X and desktop init scripts in /home/user
@ -44,7 +43,8 @@ chdirs_add=${chdirs_add:-""}
# Define dirs to apply quarrantine / whitelists # Define dirs to apply quarrantine / whitelists
privdirs=${privdirs:-"/rw/config /rw/usrlocal /rw/bind-dirs"} privdirs=${privdirs:-"/rw/config /rw/usrlocal /rw/bind-dirs"}
privdirs_add="" privdirs_add=${privdirs_add:-""}
save_backup=${save_backup:-1}
# Placeholder function: Runs at end # Placeholder function: Runs at end
@ -264,12 +264,6 @@ if qsvc vm-boot-protect-root && is_rwonly_persistent; then
fi fi
if qsvc vm-boot-protect || qsvc vm-boot-protect-root; then
echo "Preparing for unmount"
make_immutable
umount $rw
fi
# Keep configs invisible at runtime... # Keep configs invisible at runtime...
rm -rf "$defdir" $servicedir/vm-boot-tag* $servicedir/vm-boot-protect* $errlog rm -rf "$defdir" $servicedir/vm-boot-tag* $servicedir/vm-boot-protect* $errlog
@ -279,4 +273,10 @@ if [ $save_backup = 0 ]; then
rm -rf $rwbak rm -rf $rwbak
fi fi
if qsvc vm-boot-protect || qsvc vm-boot-protect-root; then
echo "Preparing for unmount"
make_immutable
umount $rw
fi
exit 0 exit 0