indempotence enhancements
fix db mountpoint handling