optimize, add tag wiperw

README.md

@@ -84,6 +84,7 @@ Some useful configurations have been supplied in /etc/default/vms:
   * vm-boot-tag-qhome: Quarantines /home in addition to the /rw system dirs. Useful for 'sys-usb' and DispVM-like functionality.
   * vm-boot-tag-noqbackup: Deletes all quarantined files that are not whitelisted.
   * vm-boot-tag-ibrowse: Preserves Firefox bookmarks while quarantining the /home folder. [Currently](https://github.com/tasket/Qubes-VM-hardening/issues/39) works with Firefox ESR. See Notes below.
+  * vm-boot-wiperw: Completely wipe and reformat the /rw partition.
 
   
 ### Scope and Limitations
@@ -118,6 +119,7 @@ Some useful configurations have been supplied in /etc/default/vms:
    * The service can be removed from the system with `cd Qubes-VM-hardening; sudo bash install --uninstall`
 
 ## Releases
+   - v0.9.1  Optimized, fix rc order, new "wiperw" tag
    - v0.9.0  Add tags and rc files, protect more home scripts, reinitialize home
    - v0.8.5  Fix template detection, /etc/default/vms erasure
    - v0.8.4  Add protection to /home/user/.config/systemd

default/vms/@tags/wiperw.rc

@@ -0,0 +1,4 @@
+# Completely wipes private volume contents
+
+blkdiscard $dev
+mkfs.ext4 $dev

vm-boot-protect.sh

@@ -46,6 +46,12 @@ privdirs=${privdirs:-"/rw/config /rw/usrlocal /rw/bind-dirs"}
 privdirs_add=${privdirs_add:-""}
 save_backup=${save_backup:-1}
 
+if is_rwonly_persistent; then
+    rwonly_pers=1
+else
+    rwonly_pers=0
+fi
+
 
 # Placeholder function: Runs at end
 vm_boot_finish() { return; }
@@ -117,7 +123,7 @@ fi
 
 
 # Run rc file commands if they exist
-if qsvc vm-boot-protect-root && is_rwonly_persistent; then
+if qsvc vm-boot-protect-root && [ $rwonly_pers = 1 ]; then
     # Get list of enabled tags from Qubes services
     tags=`find $servicedir -name 'vm-boot-tag-*' -type f -printf '%f\n' \
           | sort | sed -E 's|^vm-boot-tag-|\@tags/|'`
@@ -148,14 +154,14 @@ if qsvc vm-boot-protect || qsvc vm-boot-protect-root; then
     fi
 
     # Begin exit if in template or standalone
-    if ! is_rwonly_persistent; then
+    if [ $rwonly_pers = 0 ]; then
         make_immutable
         umount $rw
     fi
 
 fi
 # Exit if in template or standalone
-if ! is_rwonly_persistent; then
+if [ $rwonly_pers = 0 ]; then
     exit 0
 fi
 
@@ -166,7 +172,7 @@ fi
 #   * Remove /rw root startup files (config, usrlocal, bind-dirs).
 #   * Contents of vms/vms.all and vms/$vmname folders will be copied.
 
-if qsvc vm-boot-protect-root && is_rwonly_persistent; then
+if qsvc vm-boot-protect-root && [ $rwonly_pers = 1 ]; then
 
     # Check hashes
     checkcode=0