docs/FOOTPRINT.md

@@ -28,7 +28,6 @@ together in **`/usr/local/lib/libreportal/`**; everything else is named
 | File | Owner | Purpose |
 |------|-------|---------|
 | `libreportal` | root | the CLI wrapper (symlinked onto `$PATH`, see below) |
-| `uninstall.sh` | root | the uninstaller (symlinked onto `$PATH` as `libreportal-uninstall`) |
 | `libreportal-ownership` | root | reconcile the three-root ownership model |
 | `libreportal-dns` | root | edit `/etc/resolv.conf` (nameservers) |
 | `libreportal-ssh-access` | root | manage admin `authorized_keys` + sshd `PasswordAuthentication` |
@@ -48,7 +47,6 @@ quick-deploy).
 | Path | Owner | Purpose |
 |------|-------|---------|
 | `/usr/local/bin/libreportal` | root | **symlink** → `/usr/local/lib/libreportal/libreportal` (puts the CLI on `$PATH`) |
-| `/usr/local/bin/libreportal-uninstall` | root | **symlink** → `/usr/local/lib/libreportal/uninstall.sh` (location-agnostic uninstall command) |
 | `/etc/sudoers.d/<manager>` | root | scoped least-privilege grant for the manager (drop-in named after the manager user) |
 | `/etc/systemd/system/libreportal.service` | root | the task-processor service (`User=<manager>`; bakes the roots as `Environment=LP_*_DIR`) |
 | `/etc/sysctl.d/99-libreportal-hardening.conf` | root | kernel LPE-surface hardening |
@@ -75,7 +73,7 @@ config lives at `~<container-user>/.config/docker/daemon.json`.
 sudo systemctl disable --now libreportal.service
 sudo rm -f /etc/systemd/system/libreportal.service /etc/sudoers.d/libreportal
 sudo rm -f /etc/sysctl.d/99-libreportal-*.conf
-sudo rm -rf /usr/local/lib/libreportal /usr/local/bin/libreportal /usr/local/bin/libreportal-uninstall
+sudo rm -rf /usr/local/lib/libreportal /usr/local/bin/libreportal
 sudo rm -rf /libreportal-system /libreportal-containers /libreportal-backups
 # optional: the backup-engine binaries and the two users
 ```

docs/USER.md

@@ -85,15 +85,15 @@ the required ownership and will warn.
 ## Uninstall
 
 ```bash
-sudo libreportal-uninstall
+sudo /libreportal-system/install/uninstall.sh
 # keep the rootless Docker layer + image cache for a fast reinstall:
-sudo libreportal-uninstall --skip-docker-images
+sudo /libreportal-system/install/uninstall.sh --skip-docker-images
 ```
 
-`libreportal-uninstall` is a fixed command on `$PATH` (no data path to type — it
+`uninstall.sh` finds your install automatically (even with custom roots — it reads
-reads the real install locations from the installed service, so it works even with
+the real locations from the installed service) and removes the three roots, the
-custom roots). It removes the three roots, the system users, and the small
+system users, and the small out-of-tree footprint (`/usr/local/lib/libreportal`,
-out-of-tree footprint (`/usr/local/lib/libreportal`, the `/etc` integration files).
+the `/etc` integration files). `sudo init.sh uninstall` does the same thing.
 
 > ⚠️ Uninstall permanently deletes all app data, configs, and the database. Take a
 > backup first if you want to keep anything.

init.sh

@@ -1467,14 +1467,6 @@ EOF
 	sudo chown root:root $command_script
 	# Put it on $PATH via a symlink (replaces any older real file at this path).
 	sudo ln -sfn "$command_script" "$command_symlink"
-
-	# Install the uninstaller at the fixed footprint + put it on $PATH as
-	# `libreportal-uninstall` — a location-agnostic command (it resolves the real
-	# data roots from the systemd unit at run time), so users never type a data path.
-	if [[ -f "$script_dir/uninstall.sh" ]]; then
-		sudo install -m 0755 -o root -g root "$script_dir/uninstall.sh" "$lp_lib_dir/uninstall.sh"
-		sudo ln -sfn "$lp_lib_dir/uninstall.sh" /usr/local/bin/libreportal-uninstall
-	fi
 	source $sudo_bashrc
 }
 
@@ -1651,7 +1643,7 @@ runFullUninstall()
 	fi
 
 	# 3. Remove the out-of-/docker footprint (see docs/FOOTPRINT.md).
-	rm -f /usr/local/bin/libreportal /usr/local/bin/libreportal-uninstall
+	rm -f /usr/local/bin/libreportal
 	rm -rf /usr/local/lib/libreportal
 	rm -f "/etc/sudoers.d/$mgr"
 	# Keep the sysctl drop-ins when preserving docker — removing + reloading them