Better bootstrap check-install

scripts/bootstrap/bootstrap

@@ -61,17 +61,37 @@ exists-non-empty() {
     [[ -d $1 ]] && files="$(ls -A -- "$1")" && [[ -n $files ]]
 }
 
+already-installed-message() {
+    log "Toltec is already installed or partially installed"
+    log "Toltec is already installed or partially installed"
+    log "To re-enable Toltec after a system upgrade, run 'toltecctl reenable'"
+    log "To reinstall Toltec, run 'toltecctl uninstall' first"
+}
+
 # Check whether a Toltec install already exists or if conflicting files
 # remain from previous installs
 check-installed() {
-    if [[ ! -f $toltecctl_path ]]; then
-        return
+    local unit_path
+    unit_path="/lib/systemd/system/$(systemd-escape --path /opt).mount"
+    unit="$(basename "$unit_path")"
+    if [[ -f $unit_path ]] && systemctl --quiet is-active "$unit" 2> /dev/null; then
+        log ERROR "opt.mount is currently active"
+        already-installed-message
+        exit 1
     fi
-
-    if exists-non-empty /opt || exists-non-empty /home/root/.entware; then
-        log "Toltec is already installed or partially installed"
-        log "To re-enable Toltec after a system upgrade, run 'toltecctl reenable'"
-        log "To reinstall Toltec, run 'toltecctl uninstall' first"
+    if [[ "$(grep ' /opt ' /proc/mounts)" != "" ]]; then
+        log ERROR "/opt is currently mounted"
+        already-installed-message
+        exit 1
+    fi
+    if exists-non-empty /opt; then
+        log ERROR "/opt exists and is not empty"
+        already-installed-message
+        exit 1
+    fi
+    if exists-non-empty /home/root/.entware; then
+        log ERROR "/home/root/.entware exists and is not empty"
+        already-installed-message
         exit 1
     fi
 }