pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #246746 from mode89/fix/nixos-install-with-non-empty-mnt

nixos-install: fix removal of non-empty `/mnt`

Pol Dellaiera 17b46c61 9f414220

options
unified split
Changed files
+1 -1
nixos
modules
installer
tools
nixos-install.sh
+1 -1
nixos/modules/installer/tools/nixos-install.sh 
···

       
206

       
206

       
 

       
      mount --rbind --mkdir / "$mountPoint"


     

       
207

       
207

       
 

       
      mount --make-rslave "$mountPoint"


     

       
208

       
208

       
 

       
      /run/current-system/bin/switch-to-configuration boot


     

       
209

       

       
-

       
      umount -R "$mountPoint" && rmdir "$mountPoint"


     

       

       
209

       
+

       
      umount -R "$mountPoint" && (rmdir "$mountPoint" 2>/dev/null || true)


     

       
210

       
210

       
 

       
EOF


     

       
211

       
211

       
 

       
)"


     

       
212

       
212

       
 

       
fi