summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/httpserver
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-10-11 02:22:57 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-10-11 04:30:52 +0200
commitf4e742594d9c33481e9902706787e0bdb093f19d (patch)
tree5518fc3e4e2efa778186260ea685369747ff7e81 /pkgs/development/python-modules/httpserver
parentd1e1ee7b0962f3ac8fc0e4ff4f881c331c39919a (diff)
nixos: Fix detection of btrfs root volume
Regression introduced by 801c920e95642ec663d4aa486c81e5443e25b182. Since then, the btrfsSimple subtest of the installer VM test fails with: Btrfs did not return a path for the subvolume at / The reason for this is that the output for "btrfs subvol show" has changed between version 4.8.2 and 4.13.1. For example the output of "btrfs subvol show /" in version 4.8.2 was: / is toplevel subvolume In version 4.13.1, the output now is the following and thus the regular expressions used in nixos-generate-config.pl and install-grub.pl now match (which results in the error mentioned above): / Name: <FS_TREE> UUID: - Parent UUID: - Received UUID: - Creation time: - Subvolume ID: 5 Generation: 287270 Gen at creation: 0 Parent ID: 0 Top level ID: 0 Flags: - Snapshot(s): In order to fix this I've changed nixos-generate-config.pl and install-grub.pl, because both use "btrfs subvol show" in a similar vein, so the regex for parsing the output now doesn't match anymore whenever the volume path is "/", which should result in the same behaviour as we had with btrfs-progs version 4.8.2. Tested against the btrfsSimple, btrfsSubvols and btrfsSubvolDefault subtests of the installer VM test and they all succeed now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions