public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use read_file from File::Slurp

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-11 15:43:04 +02:00
parent ac13bd2575
commit 440fe8f05d
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,23 +38,7 @@ sub debug {
} }
# Read a file, returning undef if the file cannot be opened. my $cpuinfo = read_file "/proc/cpuinfo";
sub readFile {
my $filename = shift;
my $res;
if (open FILE, "<$filename") {
my $prev = $/;
undef $/;
$res = <FILE>;
$/ = $prev;
close FILE;
chomp $res;
}
return $res;
}
my $cpuinfo = readFile "/proc/cpuinfo";
sub hasCPUFeature { sub hasCPUFeature {
@ -80,9 +64,9 @@ my $videoDriver;
sub pciCheck { sub pciCheck {
my $path = shift; my $path = shift;
my $vendor = readFile "$path/vendor"; my $vendor = read_file "$path/vendor";
my $device = readFile "$path/device"; my $device = read_file "$path/device";
my $class = readFile "$path/class"; my $class = read_file "$path/class";
my $module; my $module;
if (-e "$path/driver/module") { if (-e "$path/driver/module") {
@ -152,9 +136,9 @@ foreach my $path (glob "/sys/bus/pci/devices/*") {
sub usbCheck { sub usbCheck {
my $path = shift; my $path = shift;
my $class = readFile "$path/bInterfaceClass"; my $class = read_file "$path/bInterfaceClass";
my $subclass = readFile "$path/bInterfaceSubClass"; my $subclass = read_file "$path/bInterfaceSubClass";
my $protocol = readFile "$path/bInterfaceProtocol"; my $protocol = read_file "$path/bInterfaceProtocol";
my $module; my $module;
if (-e "$path/driver/module") { if (-e "$path/driver/module") {
@ -283,7 +267,7 @@ if (! -e $fn) {
boot.loader.grub.enable = false; boot.loader.grub.enable = false;
boot.loader.gummiboot.enable = true; boot.loader.gummiboot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# !!! Remove me when nixos is on 3.10 or greater by default # !!! Remove this when nixos is on 3.10 or greater by default
# EFI booting requires kernel >= 3.10 # EFI booting requires kernel >= 3.10
boot.kernelPackages = pkgs.linuxPackages_3_10; boot.kernelPackages = pkgs.linuxPackages_3_10;
EOF EOF