Eelco Dolstra
e3879fe365
* Store the NixOS version in the top-level derivation.
...
* Change the name of the top-level derivation from "system" to
"nixos-<version>".
* Show the NixOS version in the GRUB boot menu instead of the kernel
version.
svn path=/nixos/trunk/; revision=33785
2012-04-14 17:09:59 +00:00
Lluís Batlle i Rossell
918edf8612
I think this makes the memtest module work on grub1.
...
But I can't test it because grub-install fails for me for grub1.
I tested it works for grub2.
svn path=/nixos/trunk/; revision=33739
2012-04-10 22:20:20 +00:00
Eelco Dolstra
fb0a54b803
* In nixos-install, do a nix-pull from
...
http://nixos.org/releases/nixos/nixos- <version> to ensure we're
getting the right binaries.
svn path=/nixos/trunk/; revision=33738
2012-04-10 22:17:37 +00:00
Eelco Dolstra
322a0ff7cd
* Set the version properly in the source tree in the ISO.
...
svn path=/nixos/trunk/; revision=33736
2012-04-10 21:42:47 +00:00
Lluís Batlle i Rossell
2ca7e8a43e
Reverting 33692, because memtest in the iso was failing.
...
I set the grub entry for memtest to read "Memtest86", as suggested by Eelco.
I run:
svn merge -c -33692 ^/nixos/trunk
And edited the change a bit.
svn path=/nixos/trunk/; revision=33734
2012-04-10 21:18:48 +00:00
Eelco Dolstra
c02240082a
* Add missing file.
...
svn path=/nixos/trunk/; revision=33733
2012-04-10 21:17:43 +00:00
Eelco Dolstra
dccd99b564
* Disable "nixos-gen-seccure-keys": it's not clear what it's for, it's
...
not documented, and it doesn't seem to be used anywhere.
svn path=/nixos/trunk/; revision=33732
2012-04-10 21:11:11 +00:00
Eelco Dolstra
907df082dc
* Including the Nixpkgs revision made the ISO volume label slightly
...
too long. So make it shorter.
svn path=/nixos/trunk/; revision=33731
2012-04-10 21:08:10 +00:00
Eelco Dolstra
096b7723c8
* Add a command "nixos-version" that prints the version of the
...
currently activated NixOS. This is "0.1pre-svn" when built from a
SVN tree, but contains the actual revision when installed from the
NixOS channel or from the ISO.
svn path=/nixos/trunk/; revision=33730
2012-04-10 20:56:38 +00:00
Eelco Dolstra
f9ac67c67f
* Copying manifests is slightly tricky because
...
download-using-manifests expects that the files in
/nix/var/nix/manifests are symlinks into the store.
svn path=/nixos/trunk/; revision=33727
2012-04-10 15:36:50 +00:00
Eelco Dolstra
f37b453b19
* nixos-install: Ensure that builds are done by the nixbld users
...
rather than root. Also copy all manifests into the chroot so that
any nix-pull done outside the chroot is "inherited".
svn path=/nixos/trunk/; revision=33725
2012-04-10 14:39:12 +00:00
Eelco Dolstra
f9e8e735bb
* Remove debug line.
...
svn path=/nixos/trunk/; revision=33723
2012-04-10 13:28:48 +00:00
Eelco Dolstra
5c06c66b68
* Clear more locale-related variables in the installer.
...
svn path=/nixos/trunk/; revision=33722
2012-04-10 13:28:17 +00:00
Eelco Dolstra
b2025c4687
* Use "umount -l" to clean up.
...
svn path=/nixos/trunk/; revision=33721
2012-04-10 13:25:55 +00:00
Eelco Dolstra
5409e76353
* Disable wicd in the installation CD for now, because it causes
...
dhcpcd to segfault randomly or give corrupt output. See e.g.
http://hydra.nixos.org/build/2380666/nixlog/1/raw
The problem seems to be that wicd sends a "-k" command to dhcpcd to
release the interface, which doesn't work well with a dhcpcd that
handles all interfaces in one process.
svn path=/nixos/trunk/; revision=33720
2012-04-10 13:09:56 +00:00
Lluís Batlle i Rossell
849d136aa6
Making also the system-tarball-pc show the memtest entry as the
...
pkgs.memtest86.name.
svn path=/nixos/trunk/; revision=33693
2012-04-09 20:37:54 +00:00
Lluís Batlle i Rossell
9017ccf9fe
Removing the special memtest.nix module for the isos, and using
...
the same as the usual nixos. I think this trivial change works;
I checked the grub.cfg output generated in the iso_minimal.
svn path=/nixos/trunk/; revision=33692
2012-04-09 20:36:26 +00:00
Lluís Batlle i Rossell
6e281e46b7
I update the name of the memtest entry in grub of the iso images,
...
because it can be overriden choosing another memtest86.
As an effect of a change in nixpgks, the isos will include
memtest86 4.0a instead of memtest86+ 4.20, only because the
former is released later, and I deduce it should work better.
svn path=/nixos/trunk/; revision=33691
2012-04-09 20:30:14 +00:00
Lluís Batlle i Rossell
0b8b6616b6
Making the memtest name come from the pkgs.memtest86, as the nixos
...
user can override choosing between two memtests.
svn path=/nixos/trunk/; revision=33690
2012-04-09 20:08:14 +00:00
Rob Vermaas
6b34bd8564
remove remaining reference to nixos-deploy-nwtork
...
svn path=/nixos/trunk/; revision=33663
2012-04-07 15:18:39 +00:00
Eelco Dolstra
301c4d96b1
* Remove nixos-deploy-network. It has been superceded by Charon.
...
svn path=/nixos/trunk/; revision=33662
2012-04-07 13:26:35 +00:00
Eelco Dolstra
4f4c529979
Stage 1 improvements:
...
* Load scsi_wait_scan after all other kernel modules to ensure that
all SCSI device nodes have been created.
* Increase the timeout for the appearance of the root device to 20
seconds.
* Do a "udevadm settle" just after the root device has appeared to
make sure that udev isn't accessing the device anymore (hopefully).
On EC2 (Xen), I've seen fsck on the root fail randomly with "device
in use" errors.
svn path=/nixos/trunk/; revision=33650
2012-04-06 14:20:43 +00:00
Lluís Batlle i Rossell
fbd4f65652
Fixing the comment on the new grub/memtest.nix module.
...
svn path=/nixos/trunk/; revision=33540
2012-04-02 17:31:08 +00:00
Lluís Batlle i Rossell
9a6f2231b2
Adding a module for memtest86+, so if enabled, will appear in the grub menu.
...
To enable it:
boot.loader.grub.memtest86 = true;
svn path=/nixos/trunk/; revision=33539
2012-04-02 17:19:21 +00:00
Joachim Schiele
f4d26eb446
added example for GRUB 2
...
svn path=/nixos/trunk/; revision=33448
2012-03-28 10:34:40 +00:00
Eelco Dolstra
1949a85987
* Do a sync before switching to a new configuration.
...
svn path=/nixos/trunk/; revision=33381
2012-03-23 12:29:11 +00:00
Shea Levy
7a9a33e90d
efi-boot-stub: Give startup.sh files more descriptive names
...
svn path=/nixos/trunk/; revision=33321
2012-03-21 02:05:52 +00:00
Lluís Batlle i Rossell
81655b7247
Have a more featured initrd and crashDump for the pc system tarball.
...
svn path=/nixos/trunk/; revision=33274
2012-03-19 19:01:52 +00:00
Shea Levy
fac0fef5d8
Whoops
...
svn path=/nixos/trunk/; revision=33264
2012-03-19 17:25:50 +00:00
Shea Levy
53580d514a
You cant modprobe efivars from within the chroot, so modprobe efivars when booting an efi-compatible install CD
...
svn path=/nixos/trunk/; revision=33241
2012-03-18 18:55:47 +00:00
Shea Levy
b82c253b24
Add a kernel patch for the efi boot stub to read a config file when booted without arguments, and base removable media booting off of that patch
...
The patch is currently being discussed on LKML and hopefully will be included
in mainline in some form in the future. Note that booting from the livecd has
to do a lot of work before anything is output to the console, so if the drive
is still busy don't assume the boot has hanged
svn path=/nixos/trunk/; revision=33235
2012-03-18 17:14:52 +00:00
Shea Levy
097c656361
iso-image: Make efi-bootable cds actually bootable.
...
The image passed to genisofs needs to be a FAT image with the right filesystem
layout, not an EFI executable image
svn path=/nixos/trunk/; revision=33162
2012-03-16 16:45:40 +00:00
Shea Levy
4716ccf1b1
nixosBootStub: Hide noisy efibootmgr output
...
svn path=/nixos/trunk/; revision=33157
2012-03-16 13:40:03 +00:00
Shea Levy
d9e28e909c
Move NixosBootPkg into NixOS
...
svn path=/nixos/trunk/; revision=33149
2012-03-16 11:53:50 +00:00
Shea Levy
c61d919941
Typographical conventions
...
svn path=/nixos/trunk/; revision=33148
2012-03-16 11:31:33 +00:00
Shea Levy
358b699c20
installation-cd-efi: Only build a minimal cd
...
svn path=/nixos/trunk/; revision=33147
2012-03-16 11:25:09 +00:00
Shea Levy
a315eefca1
Restore old installation-cd-new-kernel.nix and create a new installation-cd-efi.nix
...
svn path=/nixos/trunk/; revision=33146
2012-03-16 11:22:05 +00:00
Shea Levy
95bec1c001
efiBootStub: Properly handle the removableMediaImage path on different architectures
...
svn path=/nixos/trunk/; revision=33141
2012-03-16 06:08:55 +00:00
Shea Levy
8efda48496
Enable building an efi-bootable ISO
...
svn path=/nixos/trunk/; revision=33140
2012-03-16 05:37:24 +00:00
Shea Levy
1bccbc30cd
efiBootStub: Assert that the
...
kernel has the efiBootStub feature
svn path=/nixos/trunk/; revision=33138
2012-03-16 02:55:17 +00:00
Shea Levy
4caf3560be
efiBootStub: Add the installRemovableMediaImage option
...
svn path=/nixos/trunk/; revision=33135
2012-03-16 02:34:07 +00:00
Eelco Dolstra
f4903be57e
* nixos-hardware-scan: detect if we're in a VirtualBox guest and
...
enable the guest additions in that case.
svn path=/nixos/trunk/; revision=33133
2012-03-16 01:57:23 +00:00
Shea Levy
001fcad421
First shot at EFI booting.
...
Note: This feature is INCOMPLETE. Moreover, when runEfibootmgr is true it will
MODIFY NVRAM and, on Apple systems, possibly brick your firmware. PLEASE be
careful while further testing is performed
svn path=/nixos/trunk/; revision=33047
2012-03-13 19:27:59 +00:00
Eelco Dolstra
b4d16ef07e
* Fix nixos-option.
...
svn path=/nixos/trunk/; revision=33031
2012-03-13 09:36:41 +00:00
Lluís Batlle i Rossell
29ca7f2c80
Adding VIA_RHINE to the system tarball pc. I need to boot one with PXE and nfsroot with via rhine.
...
svn path=/nixos/trunk/; revision=32994
2012-03-11 16:39:49 +00:00
Eelco Dolstra
45fab492fc
* nixos-hardware-scan: "acpi-cpufreq" is automatically loaded, so we
...
don't need to detect it.
* nixos-hardware-scan: don't use modulesPath.
svn path=/nixos/trunk/; revision=32972
2012-03-10 14:35:31 +00:00
Eelco Dolstra
9d89ca0c03
* Modularise vfat support. Also add fsck.vfat to the initrd. This
...
prevents errors when booting from VFAT (e.g. an ISO image converted
using unetbootin).
svn path=/nixos/trunk/; revision=32956
2012-03-09 16:17:37 +00:00
Lluís Batlle i Rossell
13ac0a309b
Allow a way to install grub to multiple devices (for /boot on soft raid arrays).
...
svn path=/nixos/trunk/; revision=32913
2012-03-08 21:37:30 +00:00
Eelco Dolstra
4869175158
* Fix the installer. The nixos-config element in $NIX_PATH was not
...
set (and neither was $NIXOS_CONFIG).
(http://hydra.nixos.org/build/2230309 ).
svn path=/nixos/trunk/; revision=32857
2012-03-07 21:17:46 +00:00
Eelco Dolstra
a2417fd92f
* Another workaround for the bug in substitute.
...
svn path=/nixos/trunk/; revision=32814
2012-03-06 10:57:52 +00:00
Eelco Dolstra
974a74ad49
* enableWLAN -> wireless.enable.
...
svn path=/nixos/trunk/; revision=32788
2012-03-04 21:15:34 +00:00
Lluís Batlle i Rossell
0b8e992d3d
Setting the kernel 3.2 for the new-kernel nixos iso.
...
svn path=/nixos/trunk/; revision=32785
2012-03-04 21:01:20 +00:00
Eelco Dolstra
0d4eb37e16
* Fix the NixOS jobset.
...
svn path=/nixos/trunk/; revision=32783
2012-03-04 20:57:34 +00:00
Eelco Dolstra
65824d40e1
* nixos-rebuild: pass on the -I option to nix-build.
...
svn path=/nixos/trunk/; revision=32741
2012-03-02 13:31:12 +00:00
Eelco Dolstra
29d84af677
* Remove the use of the NIXPKGS and NIXOS environment variables.
...
Instead use $NIX_PATH. NIXOS_CONFIG is still supported.
svn path=/nixos/trunk/; revision=32739
2012-03-02 12:38:22 +00:00
Lluís Batlle i Rossell
97e0131291
Adding support for 3c59x NICs to the system-tarball-pc.
...
svn path=/nixos/trunk/; revision=32229
2012-02-11 21:13:10 +00:00
Florian Friesdorf
007d56b69f
intel-5150.nix: add Intel 5150 wireless firmware support
...
Author: Sergey Mironov <ierton@gmail.com>
svn path=/nixos/trunk/; revision=31231
2012-01-03 14:12:41 +00:00
Florian Friesdorf
da90f06ff8
4965agn was wrongly detected as a 3945abg
...
svn path=/nixos/trunk/; revision=31164
2011-12-30 23:26:06 +00:00
Nicolas Pierron
338bc7b9f8
Fix nixos-option without argument.
...
svn path=/nixos/trunk/; revision=31139
2011-12-29 06:33:34 +00:00
Eelco Dolstra
6b6cee46c7
* By popular demand, provide an ISO with a more recent kernel.
...
svn path=/nixos/trunk/; revision=30344
2011-11-08 19:51:39 +00:00
Eelco Dolstra
06843a45ef
* Fix auto-login.
...
svn path=/nixos/trunk/; revision=30341
2011-11-08 19:02:51 +00:00
Eelco Dolstra
dd28c62879
* My grep skills are lacking.
...
svn path=/nixos/trunk/; revision=30335
2011-11-08 16:39:13 +00:00
Eelco Dolstra
b69dd8759c
* minimal.nix: don't include base.nix. Also note it's not currently used.
...
svn path=/nixos/trunk/; revision=30333
2011-11-08 16:29:40 +00:00
Eelco Dolstra
295dafed8a
* Refactoring: graphical.nix no longer includes base.nix so that it
...
just does what it says (enable a "graphical" configuration).
* Enable KDM in the graphical CD. The "auto" display manager doesn't
properly handle shutdowns etc.
svn path=/nixos/trunk/; revision=30331
2011-11-08 16:17:37 +00:00
Eelco Dolstra
ba7f635f8b
* Move the hardware bits of base.nix into a separate module,
...
all-hardware.nix. This allows base.nix (which should probably be
renamed to something more descriptive) to be reused without getting
the hardware configuration of the installation CD.
svn path=/nixos/trunk/; revision=30327
2011-11-08 15:58:59 +00:00
Shea Levy
7f7eb341c8
Update the comment in the nixos-option generated configuration.nix in light of r30325
...
svn path=/nixos/trunk/; revision=30326
2011-11-08 15:51:39 +00:00
Eelco Dolstra
a76fe106e7
* nixos-hardware-scan: don't emit an include of an "install profile".
...
That's confusing and wrong: nixos-hardware-scan should just enable
support for the detected hardware, not enable lots of software (let
alone KDE).
svn path=/nixos/trunk/; revision=30325
2011-11-08 15:39:13 +00:00
Eelco Dolstra
3e30d87c26
* aufs2 -> aufs.
...
svn path=/nixos/trunk/; revision=30323
2011-11-08 15:12:11 +00:00
Eelco Dolstra
848485a043
* Remove installation-cd-rescue as it's not used, and the other CDs
...
should also contain all appropriate rescue tools.
svn path=/nixos/trunk/; revision=30320
2011-11-08 14:29:35 +00:00
Eelco Dolstra
b024940384
* Enable upower on the graphical ISO.
...
svn path=/nixos/trunk/; revision=30156
2011-10-31 21:08:22 +00:00
Peter Simons
20b364f4de
Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.
...
After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.
svn path=/nixos/trunk/; revision=30127
2011-10-30 15:19:58 +00:00
Shea Levy
fe045dc949
sed -i -e 's|/nix/var|@stateDir@|g' -e 's|/nix/store|@storeDir@|g' modules/installer/tools/*.sh
...
Use configurable storeDir and stateDir in the installer tools
svn path=/nixos/trunk/; revision=30106
2011-10-29 22:14:27 +00:00
Shea Levy
a16d43a8ac
Make the stateDir and storeDir available for substitution into the tools
...
svn path=/nixos/trunk/; revision=30105
2011-10-29 22:00:25 +00:00
Shea Levy
09cf6ce70c
find modules | fgrep .nix | fgrep -v .svn | fgrep -v nixpkgs.nix | xargs sed -i -e 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g'
...
Don't assume /nix/store or /nix/var in NixOS modules, this is configurable
svn path=/nixos/trunk/; revision=30104
2011-10-29 21:03:57 +00:00
Eelco Dolstra
0a1fee9ec8
* Add a module for the Broadcom firmware. Also, add it to the
...
installation CD (though the kernel on the CD is not recent
enough yet to actually support the device). (This is kind of
an abuse of "not-detected.nix".)
svn path=/nixos/trunk/; revision=30003
2011-10-24 23:41:33 +00:00
Eelco Dolstra
00ce9aaf1a
* svn.nixos.org -> nixos.org.
...
svn path=/nixos/trunk/; revision=29690
2011-10-06 11:29:44 +00:00
Peter Simons
18d52f8f4b
modules/installer/scan/not-detected.nix: don't depend on pkgs.rt73fw
...
The rt73 firmware has disappeared from the upstream server, and we don't
have a new URL yet.
svn path=/nixos/trunk/; revision=29620
2011-10-04 08:45:15 +00:00
Shea Levy
3a201ef6a7
Enable building ISOs for aufs3 kernels
...
svn path=/nixos/trunk/; revision=29538
2011-09-28 22:43:53 +00:00
Peter Simons
eb6e1310b8
strip trailing whitespace; no functional change
...
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Nicolas Pierron
def746fcdd
Add Intel firmwars (iwlwifi-6000g2{a,b}-ucode).
...
svn path=/nixos/trunk/; revision=29020
2011-09-05 09:19:55 +00:00
Lluís Batlle i Rossell
4bc0bfec4c
Making the system-tarball-pc boot fine with PXE, and include help files and a
...
readme file as examples for an easy PXE setup.
This allows booting the NixOS in the system tarball, and thus allows installing nixos.
svn path=/nixos/trunk/; revision=28585
2011-08-15 14:37:00 +00:00
Lluís Batlle i Rossell
8f6a4be721
Trying to make the system tarball for pc closer to PXE boot.
...
svn path=/nixos/trunk/; revision=28573
2011-08-14 22:01:58 +00:00
Eelco Dolstra
63e9ece771
* Support booting into another GRUB boot entry via ‘grub-reboot’.
...
This requires grub.conf to honour the saved_entry GRUB environment
variable.
svn path=/nixos/trunk/; revision=27807
2011-07-17 11:42:44 +00:00
Sander van der Burg
ab70d480ab
The machines in the network should be accessed by the node function parameter
...
svn path=/nixos/trunk/; revision=27538
2011-06-24 12:35:58 +00:00
Eelco Dolstra
d72ba42187
* Revert to GRUB 1 as the default. The switch to GRUB 2 seems to
...
cause more problems than expected, so we should probably think about
the proper migration path for a while. In the meantime, of course,
everybody is encouraged to set boot.loader.grub.version = 2.
svn path=/nixos/trunk/; revision=27209
2011-05-10 10:35:20 +00:00
Michael Raskin
f24a78fe35
Fix typo in emergency grub config
...
svn path=/nixos/trunk/; revision=27196
2011-05-09 14:21:02 +00:00
Ludovic Courtès
9c3d72cf8e
Default to GRUB version 2.
...
svn path=/nixos/trunk/; revision=27165
2011-05-05 15:07:37 +00:00
Sander van der Burg
deb6cce4bb
Adapted deploy-network to accept multiple network configurations which are zipped together. With this you can run the tool like this:
...
$ nixos-deploy-network network1.nix network2.nix
svn path=/nixos/trunk/; revision=27028
2011-04-28 11:02:58 +00:00
Eelco Dolstra
3ae283e8c3
* Remove installer2 and nixos-bootstrap-archive for lack of
...
documentation / maintenance / clear use cases.
svn path=/nixos/trunk/; revision=27008
2011-04-27 16:16:47 +00:00
Eelco Dolstra
b8a1e98180
* nixos-checkout depends on subversion. (The original nixos-checkout
...
did a "nix-env -i subversion", which may be preferable to a static
dependency.)
svn path=/nixos/trunk/; revision=27006
2011-04-27 15:42:14 +00:00
Eelco Dolstra
41a8f23189
* Revert to the old (r10556) version of the nixos-checkout script. It
...
was never intended as a generic "check out anything" script; it's
just a convenience script to obtain the NixOS trunk after
installation. So that's what it should do.
svn path=/nixos/trunk/; revision=27005
2011-04-27 15:34:33 +00:00
Eelco Dolstra
650d14be8d
* Remove most references to the "services" tree.
...
svn path=/nixos/trunk/; revision=26990
2011-04-27 13:16:33 +00:00
Eelco Dolstra
be7a7a5b78
* nixos-build-vms/build-vms.nix: drop the "nixos" function argument,
...
since the path to the NixOS source tree is known.
svn path=/nixos/trunk/; revision=26989
2011-04-27 13:01:42 +00:00
Nicolas Pierron
6839bddd1b
modules/installer/tools: nixos-gui: Fix derivation.
...
svn path=/nixos/trunk/; revision=26972
2011-04-25 17:48:59 +00:00
Nicolas Pierron
921231b555
Add nixos-gui among the installer tools.
...
Add it as a default for the graphical profile.
svn path=/nixos/trunk/; revision=26960
2011-04-25 01:03:57 +00:00
Nicolas Pierron
66eed7681d
nixos-option: Add xml output to reduce the effort in nixos-gui.
...
svn path=/nixos/trunk/; revision=26950
2011-04-24 15:30:25 +00:00
Nicolas Pierron
ba2d96cf85
nixos-option: Handle Lambdas in the injection of previously pretty-printed
...
output.
svn path=/nixos/trunk/; revision=26936
2011-04-23 17:53:05 +00:00
Eelco Dolstra
ee3269cbbd
* Put "minimal" or "graphical" in the ISO name to distinguish between
...
the files.
svn path=/nixos/trunk/; revision=26901
2011-04-20 10:48:52 +00:00
Shea Levy
8dd6f42a91
Fixed formatting
...
svn path=/nixos/trunk/; revision=26647
2011-03-31 23:06:36 +00:00
Shea Levy
f269206972
Update iso-image.nix to work with kernels that use AUFS 2.1 instead of AUFS 2. Older kernels are unaffected.
...
svn path=/nixos/trunk/; revision=26646
2011-03-31 23:03:54 +00:00
Eelco Dolstra
6c55079ab0
* nixos-hardware-scan: It's not necessary to detect Intel graphics
...
cards because the default X config contains the Intel driver.
Likewise, there is no need for the "vesa" default.
* nixos-hardware-scan: Clean up the output a bit.
svn path=/nixos/trunk/; revision=26423
2011-03-18 13:52:09 +00:00
Eelco Dolstra
6ee609a0a3
* On the installation CD, set the overcommit heuristic to "always
...
overcommit". This makes it less likely that the installer fails
randomly in low memory environments.
svn path=/nixos/trunk/; revision=26369
2011-03-16 15:17:54 +00:00
Eelco Dolstra
6646268c95
* This should no longer be needed.
...
svn path=/nixos/trunk/; revision=26331
2011-03-15 18:47:56 +00:00
Eelco Dolstra
d8b69f2fad
* grub-mkimage now requires a format flag. Also, the "sh" module has
...
disappeared. Hopefully it's not important :-)
svn path=/nixos/trunk/; revision=26234
2011-03-09 16:26:03 +00:00
Eelco Dolstra
6f1068b0b7
* Remove the unnecessary warning printed by `nixos-rebuild test'. The
...
current configuration (/var/run/current-system) is always a GC root.
svn path=/nixos/trunk/; revision=26227
2011-03-09 12:14:06 +00:00
Eelco Dolstra
f1277862cd
* Handle --cores.
...
svn path=/nixos/trunk/; revision=26188
2011-03-07 12:12:53 +00:00
Eelco Dolstra
5cff6eda3d
* Revert r21410 because it breaks handling of "--max-jobs".
...
svn path=/nixos/trunk/; revision=26187
2011-03-07 12:12:39 +00:00
Eelco Dolstra
34dea57f8a
* Add wicd to the NixOS CD.
...
svn path=/nixos/trunk/; revision=26083
2011-02-23 19:11:32 +00:00
Eelco Dolstra
9fca36bfa3
* Add the Intel 5000/6000 firmwares to the installation media.
...
svn path=/nixos/trunk/; revision=26081
2011-02-23 19:06:14 +00:00
Ludovic Courtès
0513b31f73
Improve the documentation of `generationsDir'.
...
svn path=/nixos/trunk/; revision=25718
2011-01-29 23:07:02 +00:00
Eelco Dolstra
8361444f9b
* Disable compositing for now in the graphical installation CD. It
...
seems to cause problems with KDE 4.5 on some graphics drivers (such
as Cirrus and VGA in QEMU). (NixOS/121)
svn path=/nixos/trunk/; revision=25659
2011-01-21 13:38:30 +00:00
Sander van der Burg
96b769c979
Removed the backdoor, because it does not work anymore and it has also become obsolete (Disnix uses something else now)
...
svn path=/nixos/trunk/; revision=25601
2011-01-17 16:15:59 +00:00
Sander van der Burg
c7a5960101
Removed backdoor argument
...
svn path=/nixos/trunk/; revision=25592
2011-01-16 21:59:17 +00:00
Sander van der Burg
51d66f647a
Fixed nixos-build-vms to use the new test driver. Backdoor option does not work anymore though. I have to look for another solution
...
svn path=/nixos/trunk/; revision=25591
2011-01-16 21:57:09 +00:00
Ludovic Courtès
ef54cd3d1f
system-tarball-sheevaplug: Add hint about the serial console parameters.
...
svn path=/nixos/trunk/; revision=25583
2011-01-15 22:42:07 +00:00
Ludovic Courtès
c56e039107
system-tarball-sheevaplug: Fix `kernelparams.txt'.
...
This is a followup to r23775 ("Substitute the path of the system
derivation directly in the stage 2 init script.").
svn path=/nixos/trunk/; revision=25582
2011-01-15 22:38:28 +00:00
Evgeny Egorochkin
d8ad975a1f
nixos-checkout: add support for git svn. Patch by Florian Friesdorf.
...
svn path=/nixos/trunk/; revision=25349
2011-01-02 22:13:56 +00:00
Tobias Hammerschmidt
ddc6f84d9c
updated broadcom wl driver
...
svn path=/nixos/trunk/; revision=25334
2011-01-02 11:05:46 +00:00
Eelco Dolstra
ace958f669
* Sync with the trunk.
...
svn path=/nixos/branches/stdenv-updates/; revision=25307
2010-12-28 15:56:22 +00:00
Sander van der Burg
09c30053a2
Also pass the location of NixOS as argument to the deployment expression
...
svn path=/nixos/trunk/; revision=25275
2010-12-24 16:42:31 +00:00
Eelco Dolstra
ba459a0bf3
* Fix the broken installer ( http://hydra.nixos.org/build/811980 ). The
...
hardware scan was generating a hardware.nix containing
"pkgs.linuxPackages" without having "pkgs" in scope. Also, it
shouldn't define boot.kernelPackages.
svn path=/nixos/trunk/; revision=25192
2010-12-18 17:56:04 +00:00
Lluís Batlle i Rossell
3f7751b9c2
Merging from trunk
...
svn path=/nixos/branches/stdenv-updates/; revision=25176
2010-12-17 14:59:04 +00:00
Eelco Dolstra
37a9ffffb0
* Provide a default hostname and deployment target equal to the
...
attribute name of the machine in the model. This allows
networking.hostName and deployment.targetHost to be omitted for
typical networks.
svn path=/nixos/trunk/; revision=25125
2010-12-14 13:36:54 +00:00
Tobias Hammerschmidt
05c25d3fb2
check for broadcom wireless driver - patch by Vladimír Čunát
...
svn path=/nixos/trunk/; revision=25045
2010-12-09 19:08:33 +00:00
Sander van der Burg
c318bd097e
Fixed the --no-out-link option
...
svn path=/nixos/trunk/; revision=25034
2010-12-08 14:30:55 +00:00
Sander van der Burg
11d2cd78e0
- deployment.targetHost is now used for connecting to remote hosts instead of deployment.hostname. This makes more sense.
...
- fixed error in the manual (nixos-deploy-network => nixos-build-vms)
svn path=/nixos/trunk/; revision=25031
2010-12-07 20:13:50 +00:00
Sander van der Burg
755c30c7a2
- nixos-deploy-network no longer uses an infrastructure model => use nixpkgs.system and deployment.hostname instead
...
- implemented --no-out-link option so that invoking these tools from scripts leave no garbage behind
- some misc. cleanups
svn path=/nixos/trunk/; revision=25019
2010-12-06 22:02:37 +00:00
Eelco Dolstra
651a38019d
* nixos-deploy-network: build the deploy script locally as an
...
optimisation and workaround for Nix/210.
svn path=/nixos/trunk/; revision=24956
2010-12-02 18:09:53 +00:00
Eelco Dolstra
e97a3d9cb6
* Fix incorrect path to switch-to-configuration.
...
svn path=/nixos/trunk/; revision=24955
2010-12-02 17:22:24 +00:00
Lluís Batlle i Rossell
25b9c03571
Updating from trunk (specially for the enableFontDir option, as it was not up
...
to date for nixpkgs)
svn path=/nixos/branches/stdenv-updates/; revision=24871
2010-11-26 14:16:12 +00:00
Nicolas Pierron
30943d2dc0
Fix nixos-option, accept long arguments.
...
svn path=/nixos/trunk/; revision=24631
2010-11-09 18:42:59 +00:00
Lluís Batlle i Rossell
ccc99b3fc0
Updating from trunk
...
svn path=/nixos/branches/stdenv-updates/; revision=24555
2010-10-31 19:36:37 +00:00
Lluís Batlle i Rossell
8c27201ce0
Fixing mkOverride and openssh things on system-tarballs
...
svn path=/nixos/branches/stdenv-updates/; revision=24554
2010-10-31 19:34:39 +00:00
Sander van der Burg
9c722e474d
- Added nixos-build-vms command, which builds a virtual network from a network.nix expression (also used by nixos-deploy-network)
...
- Added a backdoor option to the interactive run-vms script. This allows me to intergrate the virtual network approach with Disnix
- Small documentation fixes
Some explanation:
The nixos-build-vms command line tool can be used to build a virtual network of a network.nix specification.
For example, a network configuration (network.nix) could look like this:
{
test1 =
{pkgs, config, ...}:
{
services.openssh.enable = true;
...
};
test2 =
{pkgs, config, ...}:
{
services.openssh.enable = true;
services.xserver.enable = true;
}
;
}
By typing the following instruction:
$ nixos-build-vms -n network.nix
a virtual network is built, which can be started by typing:
$ ./result/bin/run-vms
It is also possible to enable a backdoor. In this case *.socket files are stored in the current directory
which can be used by the end-user to invoke remote instruction on a VM in the network through a Unix
domain socket.
For example by building the network with the following instructions:
$ nixos-build-vms -n network.nix --use-backdoor
and launching the virtual network:
$ ./result/bin/run-vms
You can find two socket files in your current directory, namely: test1.socket and test2.socket.
These Unix domain sockets can be used to remotely administer the test1 and test2 machine
in the virtual network.
For example by running:
$ socat ./test1.socket stdio
ls /root
You can retrieve the contents of the /root directory of the virtual machine with identifier test1
svn path=/nixos/trunk/; revision=24410
2010-10-21 22:50:12 +00:00
Lluís Batlle i Rossell
1acbc4a82f
Updating from trunk. Blind commit - no coflicts.
...
svn path=/nixos/branches/stdenv-updates/; revision=24370
2010-10-19 20:45:35 +00:00
Sander van der Burg
936e4e73d7
Modified the nixos-deploy-network script to use a 2PC-like approach illustrated in the Disnix HotSWUp paper for system configurations
...
svn path=/nixos/trunk/; revision=24352
2010-10-18 19:47:46 +00:00
Lluís Batlle i Rossell
51d0ccdf3c
Updating from trunk (to catch cron changes)
...
I had some merge problems with the system-tarball; I hope I've resolved them.
svn path=/nixos/branches/stdenv-updates/; revision=24201
2010-10-10 11:46:57 +00:00
Sander van der Burg
122e125d6b
Added the nixos-deploy-network tool. With this tool you can write a network of NixOS configurations, e.g.:
...
{
test1 = {pkgs, config, ...}:
{
# NixOS config of machine test1
...
};
test2 = {pkgs, config, ...}:
{
# NixOS config of machine test2
...
};
}
And an infrastructure expression, e.g:
{
test1 = {
hostName = "test1.example.org";
system = "i686-linux";
};
test2 = {
hostName = "test2.example.org";
system = "x86_64-linux";
};
}
And by executing:
nixos-deploy-network -n network.nix -i infrastructure.nix
The system configurations in the network expression are built, transferred to the machines in the network and finally activated.
svn path=/nixos/trunk/; revision=24146
2010-10-07 14:30:52 +00:00
Eelco Dolstra
17213c4f2a
* When generating a GRUB 1 menu, don't use the "module" command to
...
load the initrd, because pv-grub doesn't like it.
svn path=/nixos/trunk/; revision=24068
2010-10-05 13:11:30 +00:00
Rob Vermaas
7468ad50e0
nixos-option.sh: fix typo
...
svn path=/nixos/trunk/; revision=24015
2010-10-01 06:31:27 +00:00
Nicolas Pierron
567f37f3e4
Export tools which may be useful for users that want to switch to NixOS
...
without using a live CD.
svn path=/nixos/trunk/; revision=23939
2010-09-26 13:39:16 +00:00
Nicolas Pierron
62c9591d0b
Fix usage message (-description) and honor $NIXOS instead of $NIXOS_PATH.
...
svn path=/nixos/trunk/; revision=23937
2010-09-26 08:43:55 +00:00
Nicolas Pierron
7ea957fd3d
Add --install option for nixos-option which is used to handle options of
...
the target system (when installing) and also to generate a template
configuration file for users.
svn path=/nixos/trunk/; revision=23923
2010-09-25 22:29:50 +00:00
Nicolas Pierron
fe7c1eb16b
Remove duplicated definitions.
...
svn path=/nixos/trunk/; revision=23921
2010-09-25 09:44:48 +00:00
Nicolas Pierron
e20ef7564e
Update live-dvd configuration.
...
svn path=/nixos/trunk/; revision=23919
2010-09-25 09:33:17 +00:00
Nicolas Pierron
c18fe31160
Make nixos-hardware-scan adding a profile to the generated configuration
...
file.
svn path=/nixos/trunk/; revision=23918
2010-09-25 09:33:13 +00:00
Nicolas Pierron
5fb80fcc4b
Extract rescue profile from the the corresponding CD.
...
svn path=/nixos/trunk/; revision=23917
2010-09-25 09:33:09 +00:00
Nicolas Pierron
9936a6f525
Simplify system-tarball-pc.nix. Factor detected / undetected devices into
...
the instalaltion-device profile.
svn path=/nixos/trunk/; revision=23916
2010-09-25 09:33:03 +00:00
Nicolas Pierron
f3cc01bd3b
Extract graphical and minimal profiles from the installation CDs.
...
svn path=/nixos/trunk/; revision=23915
2010-09-25 09:32:57 +00:00
Nicolas Pierron
59429aa449
Change the policy used to select files added in the import list of the
...
generated configuration. Use all files listed as modules of eval-config.
svn path=/nixos/trunk/; revision=23914
2010-09-25 09:32:52 +00:00