nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-30 16:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos-install-tools: handle spaces in mount paths

Browse Source 
If a btrfs or bcachefs mountpoint has a space or some other special
characters, these will mangle the command that nixos-generate-config
runs to get information about the mount.  Avoid this by switching from
the "magic" form of calling the `open` function to the "three-argument"
form, where each command argument is specified separately.

https://perldoc.perl.org/functions/open#Whitespace-and-special-characters-in-the-filename-argument

Fixes #491738
This commit is contained in:
Adam Dinwoodie
2026-02-18 10:50:58 +00:00
parent 1559d3daa3
commit ae813a00c8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@@ -24,8 +24,7 @@ sub uniq {
}
sub runCommand {
my ($cmd) = @_;
open FILE, "$cmd 2>&1 |" or die "Failed to execute: $cmd\n";
open FILE, "-|", @_ or die "Failed to execute: @_\n";
my @ret = <FILE>;
close FILE;
return ($?, @ret);
@@ -458,7 +457,7 @@ EOF
# Is this a btrfs filesystem?
if ($fsType eq "btrfs") {
my ($status, @info) = runCommand("@btrfs@ subvol show $rootDir$mountPoint");
my ($status, @info) = runCommand("@btrfs@", "subvol", "show", "$rootDir$mountPoint");
if ($status != 0 || join("", @info) =~ /ERROR:/) {
die "Failed to retrieve subvolume info for $mountPoint\n";
}
@@ -505,7 +504,7 @@ EOF
# This should work for single and multi-device systems.
# still needs subvolume support
if ($fsType eq "bcachefs") {
my ($status, @info) = runCommand("@bcachefs@ fs usage $rootDir$mountPoint");
my ($status, @info) = runCommand("@bcachefs@", "fs", "usage", "$rootDir$mountPoint");
my $UUID = $info[0];
if ($status == 0 && $UUID =~ /^Filesystem:[ \t\n]*([0-9a-z-]+)/) {