commit c021df57927796175852f62c36b11e3b99a23f1d · pyrox.dev/nixpkgs

+9 -1

nixos/modules/system/boot/stage-1-init.sh

···

       342
       342
        
           return 0

     

       343
       343
        
       }

     

       344
       344
        
       

     

       345
       345
       +
       escapeFstab() {

     

       346
       346
       +
           local original="$1"

     

       347
       347
       +
       

     

       348
       348
       +
           # Replace space

     

       349
       349
       +
           local escaped="${original// /\\040}"

     

       350
       350
       +
           # Replace tab

     

       351
       351
       +
           echo "${escaped//$'\t'/\\011}"

     

       352
       352
       +
       }

     

       345
       353
        
       

     

       346
       354
        
       # Function for mounting a file system.

     

       347
       355
        
       mountFS() {

     
···

       569
       577
        
               continue

     

       570
       578
        
           fi

     

       571
       579
        
       

     

       572
       572
       -
           mountFS "$device" "$mountPoint" "$options" "$fsType"

     

       580
       580
       +
           mountFS "$device" "$(escapeFstab "$mountPoint")" "$(escapeFstab "$options")" "$fsType"

     

       573
       581
        
       done

     

       574
       582
        
       

     

       575
       583
        
       exec 3>&-

+1 -1

nixos/modules/tasks/filesystems.nix

···

       167
       167
        
                else throw "No device specified for mount point ‘${fs.mountPoint}’.")

     

       168
       168
        
             + " " + escape (rootPrefix + fs.mountPoint)

     

       169
       169
        
             + " " + fs.fsType

     

       170
       170
       -
             + " " + builtins.concatStringsSep "," (fs.options ++ (extraOpts fs))

     

       170
       170
       +
             + " " + escape (builtins.concatStringsSep "," (fs.options ++ (extraOpts fs)))

     

       171
       171
        
             + " " + (optionalString (!excludeChecks)

     

       172
       172
        
               ("0 " + (if skipCheck fs then "0" else if fs.mountPoint == "/" then "1" else "2")))

     

       173
       173
        
             + "\n"

+1

nixos/release-combined.nix

···

       77
       77
        
               (onFullSupported "nixos.tests.i3wm")

     

       78
       78
        
               (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple")

     

       79
       79
        
               (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolDefault")

     

       80
       80
       +
               (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolEscape")

     

       80
       81
        
               (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvols")

     

       81
       82
        
               (onSystems ["x86_64-linux"] "nixos.tests.installer.luksroot")

     

       82
       83
        
               (onSystems ["x86_64-linux"] "nixos.tests.installer.lvm")

+4 -3

nixos/tests/installer-systemd-stage-1.nix

···

       8
       8
        
         # them when fixed.

     

       9
       9
        
         inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; })

     

       10
       10
        
           # bcache

     

       11
       11
       -
           # btrfsSimple

     

       12
       12
       -
           # btrfsSubvolDefault

     

       13
       13
       -
           # btrfsSubvols

     

       11
       11
       +
           btrfsSimple

     

       12
       12
       +
           btrfsSubvolDefault

     

       13
       13
       +
           btrfsSubvolEscape

     

       14
       14
       +
           btrfsSubvols

     

       14
       15
        
           # encryptedFSWithKeyfile

     

       15
       16
        
           # grub1

     

       16
       17
        
           # luksroot

+21

nixos/tests/installer.nix

···

       911
       911
        
             )

     

       912
       912
        
           '';

     

       913
       913
        
         };

     

       914
       914
       +
       

     

       915
       915
       +
         # Test to see if we can deal with subvols that need to be escaped in fstab

     

       916
       916
       +
         btrfsSubvolEscape = makeInstallerTest "btrfsSubvolEscape" {

     

       917
       917
       +
           createPartitions = ''

     

       918
       918
       +
             machine.succeed(

     

       919
       919
       +
                 "sgdisk -Z /dev/vda",

     

       920
       920
       +
                 "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",

     

       921
       921
       +
                 "mkswap /dev/vda2 -L swap",

     

       922
       922
       +
                 "swapon -L swap",

     

       923
       923
       +
                 "mkfs.btrfs -L root /dev/vda3",

     

       924
       924
       +
                 "btrfs device scan",

     

       925
       925
       +
                 "mount LABEL=root /mnt",

     

       926
       926
       +
                 "btrfs subvol create '/mnt/nixos in space'",

     

       927
       927
       +
                 "btrfs subvol create /mnt/boot",

     

       928
       928
       +
                 "umount /mnt",

     

       929
       929
       +
                 "mount -o 'defaults,subvol=nixos in space' LABEL=root /mnt",

     

       930
       930
       +
                 "mkdir /mnt/boot",

     

       931
       931
       +
                 "mount -o defaults,subvol=boot LABEL=root /mnt/boot",

     

       932
       932
       +
             )

     

       933
       933
       +
           '';

     

       934
       934
       +
         };

     

       914
       935
        
       }