Wouter den Breejen
ab41596a7f
Added option boot.extraGrubEntriesBeforeNixos=true/false to boot by default into nixos-default or into your extraGrubEntries
...
svn path=/nixos/trunk/; revision=12263
2008-07-05 00:16:39 +00:00
Eelco Dolstra
8cad20e1c9
* Doh!
...
svn path=/nixos/trunk/; revision=12016
2008-06-09 11:14:28 +00:00
Eelco Dolstra
ebb43a3f67
* Make the location of Nixpkgs a function argument (defaulting
...
to ../../nixpkgs). This makes the "pkgs" symlink under the
nixos checkout unnecessary.
svn path=/nixos/trunk/; revision=11989
2008-06-05 15:33:17 +00:00
Eelco Dolstra
bd33b3e756
* Build through the Nix daemon if it's running.
...
svn path=/nixos/trunk/; revision=11966
2008-06-04 09:01:54 +00:00
Eelco Dolstra
cc7f3c7aaa
* URL updates.
...
svn path=/nixos/trunk/; revision=11801
2008-05-09 15:08:43 +00:00
Eelco Dolstra
5feff6f5d4
* Symlink $mountPoint/etc/mtab to /proc/mounts.
...
svn path=/nixos/trunk/; revision=11793
2008-05-09 10:08:02 +00:00
Eelco Dolstra
728a278641
* Unmount only the filesystems that the installer actually mounted.
...
So if the user mounted /mnt/boot or something, don't unmount it.
svn path=/nixos/trunk/; revision=11792
2008-05-09 09:32:31 +00:00
Michael Raskin
98748a319a
I have probably fixed the "separate /boot" problem. Tested in Qemu, it worked
...
svn path=/nixos/trunk/; revision=11789
2008-05-09 05:58:21 +00:00
Tobias Hammerschmidt
228792a70d
updated svn repositories
...
svn path=/nixos/trunk/; revision=11721
2008-04-25 20:28:39 +00:00
Eelco Dolstra
e32a8437d5
svn path=/nixos/trunk/; revision=11203
2008-03-19 12:58:14 +00:00
Ludovic Courtès
3a973ab55c
nixos-rebuild: Determine $NIXPKGS' from
$NIXOS' by default.
...
svn path=/nixos/trunk/; revision=11200
2008-03-19 12:27:30 +00:00
Eelco Dolstra
473d75fc46
* Typo.
...
svn path=/nixos/trunk/; revision=11199
2008-03-19 12:21:09 +00:00
Eelco Dolstra
52aed402db
* Moved to Nixpkgs.
...
svn path=/nixos/trunk/; revision=11155
2008-03-17 10:51:09 +00:00
Eelco Dolstra
95d41d5e27
* Allow the location of Nixpkgs to be specified through $NIXPKGS.
...
* $NIXOS_NO_PULL: changed to $NIXOS_PULL (which should be set to "0"
to disable pulling).
* New variable $NIXOS_BUILD_NIX, which can be set to "0" to disable
building nixUnstable from Nixpkgs.
svn path=/nixos/trunk/; revision=11096
2008-03-13 10:17:42 +00:00
Michael Raskin
4b31843e64
Added nixos-gen-seccure-keys and modified nixos-checkout to store /etc/nixos/version.nix with string representing checkout version.
...
svn path=/nixos/trunk/; revision=10936
2008-03-03 23:31:48 +00:00
Michael Raskin
067db8fa72
Modifications to nixos-checkout for multi-branch support.
...
svn path=/nixos/trunk/; revision=10558
2008-02-08 19:13:29 +00:00
Eelco Dolstra
ce250ffb37
* Installation CD: include a lot of modules (SATA, PATA, Firewire,
...
USB, some SCSI controllers) in the initrd for mounting the CD.
* Add nix-hardware-scan to the system.
* Upstart: don't use the -v flag.
* Include the NixOS version in the ISO image filename.
* Include testdisk and ms-sys in the CD.
* Some bugfixes in the installer.
svn path=/nixos/trunk/; revision=10556
2008-02-08 15:59:15 +00:00
Eelco Dolstra
c30e7b0f13
* Determine networking.enableIntel3945ABGFirmware.
...
svn path=/nixos/trunk/; revision=10490
2008-02-04 10:39:06 +00:00
Eelco Dolstra
7521d6c49a
* Add the Intel 82G965.
...
svn path=/nixos/trunk/; revision=10410
2008-01-30 14:57:13 +00:00
Eelco Dolstra
8ea2ce37c8
* NVIDIA support.
...
svn path=/nixos/trunk/; revision=10409
2008-01-30 14:53:06 +00:00
Eelco Dolstra
8e94f3ad67
* First attempt at detecting services.xserver.videoDriver.
...
svn path=/nixos/trunk/; revision=10408
2008-01-30 14:50:25 +00:00
Eelco Dolstra
92fffa1ee8
* Detect the networking.enableIntel2200BGFirmware option.
...
svn path=/nixos/trunk/; revision=10406
2008-01-30 14:32:02 +00:00
Eelco Dolstra
7363895f6d
* Rewrote the hardware scanner in Perl.
...
svn path=/nixos/trunk/; revision=10405
2008-01-30 14:16:38 +00:00
Eelco Dolstra
9fd5d70968
* The CD is now a true live CD: you can run Nix operations in it
...
thanks to unionfs. For instance, nix-env and nixos-rebuild work.
The tricky part was to build a Nix database (in the tmpfs/unionfs)
which is now necessary to prevent store paths on the CD from being
deleted right away because they otherwise wouldn't be valid.
* nixos-install: use the /etc/nixos/configuration.nix from the target
file system (don't copy it anymore). Since the user is supposed to
mount the target file system on /mnt anyway, we may as well require
that configuration.nix is placed in /mnt/etc/nixos. This also makes
upgrading / reinstalling much easier, since it will automatically
use the right configuration.nix.
svn path=/nixos/trunk/; revision=10399
2008-01-30 01:28:56 +00:00
Eelco Dolstra
fcef0545be
* A program for generating the hardware-specific bits of
...
configuration.nix. Right now it finds out the following:
- How many CPUs the machine has (for nix.maxJobs).
- Whether to load KVM support (either kvm-intel or kvm-amd).
- The modules necessary for the initrd by scanning the PCI and USB
busses. Only mass-storage and HID related modules are added.
svn path=/nixos/trunk/; revision=10221
2008-01-18 16:17:48 +00:00
Michael Raskin
8eeb6a0a91
'As GRUB limit on x86 is probably 191 entries, make sure we don't get more than 190 (one for safety)'
...
svn path=/nixos/trunk/; revision=10110
2008-01-10 12:28:01 +00:00
Michael Raskin
ad2ecc2cb5
Changed GRUB failure backups a bit after testing
...
svn path=/nixos/trunk/; revision=10108
2008-01-10 05:50:58 +00:00
Michael Raskin
99a2f550c0
Modifications to grub-menu-builder: copy default kernel and initrd to /boot/nixos-.. , limit menu size
...
svn path=/nixos/trunk/; revision=10106
2008-01-10 04:43:19 +00:00
Michael Raskin
020f035a5d
Made grub-menu-builder write (hd0,0) instead of hd0,0
...
svn path=/nixos/trunk/; revision=10101
2008-01-09 05:36:40 +00:00
Eelco Dolstra
9da275c388
* nixos-checkout: don't subscribe to the Nixpkgs channel anymore,
...
it's not really needed. (Suggested by Cyril Romain.)
svn path=/nixos/trunk/; revision=10093
2008-01-07 22:24:00 +00:00
Eelco Dolstra
f4399a1883
* Option to set the Grub background image. To
...
get the background image to work, you may need
to set NIXOS_INSTALL_GRUB=1 when calling
nixos-rebuild to force Grub to be reinstalled
with splashimage support.
svn path=/nixos/trunk/; revision=10071
2008-01-04 15:02:31 +00:00
Eelco Dolstra
35f5252630
* If building nixFallback fails, use nixUnstable from Nixpkgs as
...
a last-chance fallback.
svn path=/nixos/trunk/; revision=10050
2008-01-02 15:30:31 +00:00
Eelco Dolstra
d4168a89b1
* Get rid of some spurious error messages.
...
svn path=/nixos/trunk/; revision=9968
2007-12-25 16:07:55 +00:00
Michael Raskin
f81bebe2d7
Added possibility of building multiple configurations by one nixos-rebuild.
...
svn path=/nixos/trunk/; revision=9959
2007-12-20 11:36:30 +00:00
Michael Raskin
6733486ec8
Corrected fontDir builder; beginning of changes to allow configuration having multiple variaions in GRUB menu/
...
svn path=/nixos/trunk/; revision=9957
2007-12-20 04:36:30 +00:00
Michael Raskin
189a608cf5
Now copyKernels allows both /nix/store and /boot be on separate partitions (you need to specify where /boot is for this).
...
svn path=/nixos/trunk/; revision=9949
2007-12-16 18:56:36 +00:00
Eelco Dolstra
d2377fae72
* Make sure that /nix/var/nix/channel-cache exists.
...
svn path=/nixos/trunk/; revision=9854
2007-12-04 12:31:00 +00:00
Michael Raskin
8c9d312e21
Added xfs; fixed nixos-checkout
...
svn path=/nixos/trunk/; revision=9579
2007-11-05 08:54:30 +00:00
Michael Raskin
b494c20cb5
Small correction to xserver.nix for compiz; also nixos-checkout now creates services where it should be.
...
svn path=/nixos/trunk/; revision=9578
2007-11-05 08:33:12 +00:00
Eelco Dolstra
b9dd7509b6
* nixos-rebuild: before building NixOS, first build the latest Nix and
...
use that one to build NixOS. This will make it easier to use
bleeding-edge features in the NixOS expressions.
svn path=/nixos/trunk/; revision=9336
2007-09-18 15:38:05 +00:00
Eelco Dolstra
f2780fdc62
* Add a top-level default.nix for NixOS which has attributes useful
...
for building parts of the system. E.g.
$ nix-build /etc/nixos/nixos -A upstartJobs.xserver
to build the Upstart job for the X server, or
$ nix-build /etc/nixos/nixos -A kernel
to build the NixOS kernel.
* /etc/profile.sh: if ~/.nix-defexpr doesn't exist yet, create it as a
directory and add links to root's channels, /etc/nixos/nixos and
/etc/nixos/install-source.nix (as "nixpkgs_sys").
* boot.useKernel -> boot.kernel.
svn path=/nixos/trunk/; revision=9334
2007-09-18 15:06:24 +00:00
Eelco Dolstra
2a4417d637
* make-etc / activate-configuration: allow /etc files to be installed
...
as regular files instead of symlinks to the store.
* Sudo configuration, enabled through security.sudo.enable (on by
default). The contents of the sudoers file is specified in
security.sudo.configFile. The default sudoers file allows members
of the new "wheel" group to run any command.
svn path=/nixos/trunk/; revision=9138
2007-08-16 15:09:06 +00:00
Eelco Dolstra
ad22e587ab
* nixos-rebuild: do a nix-pull on the Nixpkgs channel manifest. I.e., you
...
don't need to be subscribed to the Nixpkgs channel to get binary downloads.
This is possible because nix-pull is now pretty fast.
svn path=/nixos/trunk/; revision=9133
2007-08-15 12:01:20 +00:00
Eelco Dolstra
cc4d0d118a
* Remove old manifests in the installer.
...
svn path=/nixos/trunk/; revision=9130
2007-08-15 09:30:28 +00:00
Michael Raskin
58b29cd565
Added possibility to give configurations custom names.
...
svn path=/nixos/trunk/; revision=8915
2007-06-23 16:09:05 +00:00
Michael Raskin
9ad649ea36
Added services tree checkout - needed, for example, for apache-httpd
...
svn path=/nixos/trunk/; revision=8890
2007-06-18 20:33:30 +00:00
Eelco Dolstra
c819d76ec7
* Option boot.extraGrubEntries to add arbitrary text to Grub's menu.lst.
...
svn path=/nixos/trunk/; revision=8883
2007-06-15 11:40:57 +00:00
Eelco Dolstra
c10fe148a3
* /var/run/current-system symlinks to the top-level path of the system
...
configuration now.
* /var/run/booted-system symlinks to the system configuration used at
boot time.
svn path=/nixos/trunk/; revision=8381
2007-03-20 13:01:53 +00:00
Eelco Dolstra
582abdaae2
* Option boot.copyKernels to copy all kernels and initrd to
...
/boot/kernels. This is necessary if /nix is on a different file
system than /. (And it will allow us to support a separate /boot
partition too.)
svn path=/nixos/trunk/; revision=7887
2007-02-09 16:19:29 +00:00
Eelco Dolstra
2c62eac3a1
* Check if Subversion is already installed.
...
svn path=/nixos/trunk/; revision=7886
2007-02-08 19:53:21 +00:00
Eelco Dolstra
7ac8157fed
* Doh!
...
svn path=/nixos/trunk/; revision=7885
2007-02-08 19:51:36 +00:00
Eelco Dolstra
923348b490
* Provide a script "nixos-checkout" to replace the NixOS/Nixpkgs
...
sources in /etc/nixos with a Subversion checkout of those trees.
This should be run after a successful installation if you want to
keep NixOS up to date from Subversion.
svn path=/nixos/trunk/; revision=7859
2007-02-06 14:13:12 +00:00
Eelco Dolstra
97aa1faa33
* Create /etc/nixos/install-source.nix.
...
svn path=/nixos/trunk/; revision=7858
2007-02-06 14:06:42 +00:00
Eelco Dolstra
1551c50a20
svn path=/nixos/trunk/; revision=7857
2007-02-06 13:21:15 +00:00
Eelco Dolstra
b044899891
* A helpful warning.
...
svn path=/nixos/trunk/; revision=7856
2007-02-06 13:20:53 +00:00
Eelco Dolstra
5d0f7bdadd
* Better checking.
...
svn path=/nixos/trunk/; revision=7854
2007-02-06 13:12:10 +00:00
Eelco Dolstra
08ad51690d
* Merge the test and upgrade scripts into a program "nixos-rebuild"
...
which is included in the system path.
svn path=/nixos/trunk/; revision=7853
2007-02-06 13:09:25 +00:00
Eelco Dolstra
25684805d5
* nixos-installer -> nixos-install.
...
svn path=/nixos/trunk/; revision=7852
2007-02-06 10:46:36 +00:00
Eelco Dolstra
3481970525
* Consistent naming.
...
svn path=/nixos/trunk/; revision=7851
2007-02-06 10:41:04 +00:00
Eelco Dolstra
b674f74c2d
* Installer fixes.
...
svn path=/nixos/trunk/; revision=7848
2007-02-05 21:06:59 +00:00
Eelco Dolstra
6291281358
* Copy the NixOS/Nixpkgs sources to /etc/nixos on the target.
...
svn path=/nixos/trunk/; revision=7846
2007-02-05 16:23:19 +00:00
Eelco Dolstra
4f64075215
* Installer: defaults for all arguments. The NixOS sources are
...
assumed to be in /etc/nixos/nixos and the system configuration in
/etc/nixos/configuration.nix. This is overridable through a few
environment variables.
* Installer: check that the mount point does in fact have a file
system mounted on it (so that we don't install in an empty /mnt),
and don't unmount afterwards for symmetry.
svn path=/nixos/trunk/; revision=7845
2007-02-05 15:52:55 +00:00
Eelco Dolstra
4b7e9b5401
* Instructions on testing the installer without having to make an ISO
...
/ burn a CD, namely by making a loopback target file system.
* Installer: continue if the MANIFEST on the CD is missing (useful if
we're not actually installing from a CD).
svn path=/nixos/trunk/; revision=7843
2007-02-05 15:12:47 +00:00
Eelco Dolstra
0685f24957
svn path=/nixos/trunk/; revision=7786
2007-01-23 20:09:06 +00:00
Eelco Dolstra
241b28d101
* Register everything in the Nix store on the installation CD as a
...
substitute to speed up installation.
svn path=/nixos/trunk/; revision=7783
2007-01-23 17:17:10 +00:00
Eelco Dolstra
d883483a0e
* Use paths-from-graph.pl.
...
svn path=/nixos/trunk/; revision=7776
2007-01-23 15:07:30 +00:00
Eelco Dolstra
c7c16f384a
* Fixed some installer bugs.
...
svn path=/nixos/trunk/; revision=7629
2007-01-11 00:06:46 +00:00
Eelco Dolstra
fd4c1a2c43
* The user should mount the target file system.
...
svn path=/nixos/trunk/; revision=7598
2007-01-09 23:12:41 +00:00
Eelco Dolstra
efefd93551
* Create /etc/nixos if it doesn't exist.
...
svn path=/nixos/trunk/; revision=7597
2007-01-09 21:28:08 +00:00
Eelco Dolstra
5b5b6f9f63
* Use a shell in the closure we just copied to the target.
...
svn path=/nixos/trunk/; revision=7596
2007-01-09 21:25:53 +00:00
Eelco Dolstra
37ab8be36f
* Doh.
...
svn path=/nixos/trunk/; revision=7595
2007-01-09 21:19:53 +00:00
Eelco Dolstra
c5ab0cec9f
* More installer fixes.
...
svn path=/nixos/trunk/; revision=7359
2006-12-17 00:10:28 +00:00
Eelco Dolstra
a0759a51e9
* Some installer fixes.
...
* Readme.
svn path=/nixos/trunk/; revision=7358
2006-12-16 23:50:10 +00:00
Eelco Dolstra
3e7f4280df
* activate-configuration.sh: make sure that we're running on a NixOS
...
installation to prevent horrible accidents.
* Add the kernel parameters to isolinux.cfg.
* Use useradd/groupadd to create users/groups; use Glibc's getent to
check for existence.
* Create the root account properly.
svn path=/nixos/trunk/; revision=7357
2006-12-16 21:48:12 +00:00
Eelco Dolstra
8f21b0119c
* Get the CD to build again.
...
svn path=/nixos/trunk/; revision=7356
2006-12-16 18:24:49 +00:00
Eelco Dolstra
0eb46ca409
* Idem.
...
svn path=/nixos/trunk/; revision=7332
2006-12-13 12:21:37 +00:00
Eelco Dolstra
2d0f190f20
* More refactoring: renamed boot-environment.nix to system.nix (since
...
it does a lot more than just booting), and merged
system-configuration.nix into system.nix.
svn path=/nixos/trunk/; revision=7318
2006-12-11 17:36:57 +00:00
Eelco Dolstra
c063ea2bfa
* Use runCommand.
...
svn path=/nixos/trunk/; revision=7300
2006-12-10 22:43:04 +00:00
Eelco Dolstra
acf656125c
* Lots of refactoring.
...
* Clear the PATH in most scripts. This helps to ensure purity.
svn path=/nixos/trunk/; revision=7299
2006-12-10 22:29:44 +00:00
Eelco Dolstra
bc3f4f8352
* Set up Nix so that builds are never performed as root, but rather
...
under nix-build-N.
svn path=/nixos/trunk/; revision=7172
2006-11-29 23:41:21 +00:00
Eelco Dolstra
5c89e891df
* Refactoring.
...
svn path=/nixos/trunk/; revision=7156
2006-11-28 10:45:21 +00:00