From fe76b9f4b461c6a25f49a80a2476b7d60537c455 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 16 Jun 2022 09:37:52 -0500 Subject: [PATCH 1/4] doc: fix some darwin uninstall gaps --- doc/manual/src/installation/installing-binary.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/manual/src/installation/installing-binary.md b/doc/manual/src/installation/installing-binary.md index 9fb9c80c3..762402948 100644 --- a/doc/manual/src/installation/installing-binary.md +++ b/doc/manual/src/installation/installing-binary.md @@ -148,7 +148,8 @@ and `/etc/zshrc` which you may remove. This will remove all the build users that no longer serve a purpose. 4. Edit fstab using `sudo vifs` to remove the line mounting the Nix Store - volume on `/nix`, which looks like this, + volume on `/nix`, which looks like + `UUID= /nix apfs rw,noauto,nobrowse,suid,owners` or `LABEL=Nix\040Store /nix apfs rw,nobrowse`. This will prevent automatic mounting of the Nix Store volume. @@ -175,6 +176,16 @@ and `/etc/zshrc` which you may remove. This will remove the Nix Store volume and everything that was added to the store. + If this command indicates that it couldn't remove the volume, your Nix Store + volume may not be mounted. Run the following to double-check: + + ```console + diskutil list + ``` + + If you see a Nix Store volume, re-run the diskutil deleteVolume command, but + replace `/nix` with the volume's `diskXsY` identifier. + > **Note** > > After you complete the steps here, you will still have an empty `/nix` From 649c9d9b4c0b2327b11c44cda7b5738efa245c08 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 16 Jun 2022 09:47:15 -0500 Subject: [PATCH 2/4] doc: acknowledge post-rsync reality Before #5150 the copy-to-store phase of the install was idempotent, but the recursive cp isn't. This is probably baiting a few people into trying corrective installs that will fail. --- doc/manual/src/installation/installing-binary.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/manual/src/installation/installing-binary.md b/doc/manual/src/installation/installing-binary.md index 762402948..a2f284d5a 100644 --- a/doc/manual/src/installation/installing-binary.md +++ b/doc/manual/src/installation/installing-binary.md @@ -176,15 +176,17 @@ and `/etc/zshrc` which you may remove. This will remove the Nix Store volume and everything that was added to the store. - If this command indicates that it couldn't remove the volume, your Nix Store - volume may not be mounted. Run the following to double-check: + If this command indicates that it couldn't remove the volume, you should + make sure you don't have an _unmounted_ Nix Store volume. Look for a + "Nix Store" volume in the output of the following command: ```console diskutil list ``` - If you see a Nix Store volume, re-run the diskutil deleteVolume command, but - replace `/nix` with the volume's `diskXsY` identifier. + If you _do_ see a "Nix Store" volume, delete it by re-running the diskutil + deleteVolume command, but replace `/nix` with the store volume's `diskXsY` + identifier. > **Note** > @@ -202,8 +204,7 @@ and `/etc/zshrc` which you may remove. We believe we have ironed out how to cleanly support the read-only root -on modern macOS. New installs will do this automatically, and you can -also re-run a new installer to convert your existing setup. +on modern macOS. New installs will do this automatically. This section previously detailed the situation, options, and trade-offs, but it now only outlines what the installer does. You don't need to know From 3c2de2da01704ad2b43182b3b9080dc541e7efc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 4 Aug 2022 06:23:36 -0500 Subject: [PATCH 3/4] Update doc/manual/src/installation/installing-binary.md Co-authored-by: Valentin Gagarin --- doc/manual/src/installation/installing-binary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/manual/src/installation/installing-binary.md b/doc/manual/src/installation/installing-binary.md index a2f284d5a..d94e78a91 100644 --- a/doc/manual/src/installation/installing-binary.md +++ b/doc/manual/src/installation/installing-binary.md @@ -149,7 +149,7 @@ and `/etc/zshrc` which you may remove. 4. Edit fstab using `sudo vifs` to remove the line mounting the Nix Store volume on `/nix`, which looks like - `UUID= /nix apfs rw,noauto,nobrowse,suid,owners` or + `UUID= /nix apfs rw,noauto,nobrowse,suid,owners` or `LABEL=Nix\040Store /nix apfs rw,nobrowse`. This will prevent automatic mounting of the Nix Store volume. From 84a26882f86e68df3f2d0f66ff627e0dbd6365f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 4 Aug 2022 06:23:45 -0500 Subject: [PATCH 4/4] Update doc/manual/src/installation/installing-binary.md Co-authored-by: Valentin Gagarin --- doc/manual/src/installation/installing-binary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/manual/src/installation/installing-binary.md b/doc/manual/src/installation/installing-binary.md index d94e78a91..ed0f65177 100644 --- a/doc/manual/src/installation/installing-binary.md +++ b/doc/manual/src/installation/installing-binary.md @@ -176,7 +176,7 @@ and `/etc/zshrc` which you may remove. This will remove the Nix Store volume and everything that was added to the store. - If this command indicates that it couldn't remove the volume, you should + If the output indicates that the command couldn't remove the volume, you should make sure you don't have an _unmounted_ Nix Store volume. Look for a "Nix Store" volume in the output of the following command: