commit cb3a0f55e8e37c4f7db239ce27491fd66c9503cc · pyrox.dev/nixpkgs

+5 -3
nixos/modules/system/boot/stage-2-init.sh
···

       62
       62
        
       chmod -f 1775 /nix/store

     

       63
       63
        
       if [ -n "@readOnlyStore@" ]; then

     

       64
       64
        
           if ! [[ "$(findmnt --noheadings --output OPTIONS /nix/store)" =~ ro(,|$) ]]; then

     

       65
       65
       -
               # FIXME when linux < 4.5 is EOL, switch to atomic bind mounts

     

       66
       66
       -
               #mount /nix/store /nix/store -o bind,remount,ro

     

       67
       67
       -
               mount --bind /nix/store /nix/store

     

       65
       65
       +
               if [ -z "$container" ]; then

     

       66
       66
       +
                   mount --bind /nix/store /nix/store

     

       67
       67
       +
               else

     

       68
       68
       +
                   mount --rbind /nix/store /nix/store

     

       69
       69
       +
               fi

     

       68
       70
        
               mount -o remount,ro,bind /nix/store

     

       69
       71
        
           fi

     

       70
       72
        
       fi