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

Automated install is once more succesful

Browse Source 
Author:    raskin @ rev 14229

svn path=/nixos/branches/fix-style/; revision=14440
This commit is contained in:
Nicolas Pierron 2009-03-07 18:01:12 +00:00
parent 2ec60d4023
commit c69348cd07
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/cd-dvd/remote-install-scripts/install-script.sh
View File

@ -14,7 +14,7 @@ mkdir -p /mnt/etc/nixos
cat > /mnt/etc/nixos/configuration.nix <<EOF
pkgs: full_configuration: {
{pkgs, config, ...}: {
boot = {
grubDevice = "/dev/sda";
copyKernels = true;

2
installer/cd-dvd/remote-install-scripts/install-test.sh
View File

@ -17,7 +17,7 @@ set -x
echo "Installation starting.." > report
nix-build -o socat /etc/nixos/nixpkgs -A socat || { echo "Failed to build socat" >&2 ; exit 2; };
nix-build -o qemu /etc/nixos/nixpkgs -A qemu || { echo "Failed to build qemu" >&2 ; exit 2; };
nix-build -o qemu /etc/nixos/nixpkgs -A ${QEMU_PACKAGE:-qemu} || { echo "Failed to build qemu" >&2 ; exit 2; };
echo "reboot" | ./socat/bin/socat tcp-listen:4424 stdio >> report &

6
installer/cd-dvd/rescue-cd-configurable.nix
View File

@ -137,7 +137,7 @@ rec {
nixpkgsRel = "nixpkgs" + (if networkNixpkgs != "" then "-" + networkNixpkgs else "");
configuration = pkgs: final_configuration: let preConfiguration ={
configuration = {pkgs, config, ...}: let preConfiguration ={
boot = {
isLiveCD = true;
# The label used to identify the installation CD.
@ -164,8 +164,8 @@ rec {
udev = {
addFirmware = []
++ (pkgs.lib.optional intel3945FWEnable pkgs.iwlwifi3945ucode)
++ (pkgs.lib.optional intel4965FWEnable pkgs.iwlwifi4965ucode)
#++ (pkgs.lib.optional intel3945FWEnable pkgs.iwlwifi3945ucode)
#++ (pkgs.lib.optional intel4965FWEnable pkgs.iwlwifi4965ucode)
;
};