philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

210 commits

Author SHA1 Message Date
Eelco Dolstra cbe27af191 * Removed an unnecessary flag. 
svn path=/nixos/trunk/; revision=16999
 2009-09-09 21:22:25 +00:00
Eelco Dolstra 17d287afa5 * Bump the number of maximum open files for Nix builders. 
Our VM builds were causing Samba to go over this limit.

svn path=/nixos/trunk/; revision=16960
 2009-09-04 15:27:52 +00:00
Eelco Dolstra 685335df2f * system.build.system -> system.build.toplevel, since the former name 
is just too weird.

svn path=/nixos/trunk/; revision=16954
 2009-09-04 09:29:18 +00:00
Eelco Dolstra 2892aed712 * lib/eval-config.nix: combined "configuration" and "extraModules" 
into one argument "modules".
* release.nix: fixed the manual job.
* ISO generation: break an infinite recursion.  Don't know why this
  suddenly happens.  Probably because of the nixpkgs.config change,
  but I don't see why.  Maybe the option evaluation is too strict.

svn path=/nixos/trunk/; revision=16878
 2009-08-27 11:57:43 +00:00
Michael Raskin 769dc2f7e6 Write an explanation for a rule edit needed by LiveCD 
svn path=/nixos/trunk/; revision=16774
 2009-08-19 17:24:33 +00:00
Eelco Dolstra 11c603c3fb * Fix booting from CD. 60-persistent-storage.rules requires some 
variables set by 60-cdrom_id.rules.

svn path=/nixos/trunk/; revision=16773
 2009-08-19 16:48:28 +00:00
Eelco Dolstra 88c505c9e0 * make-etc.sh: fixed the duplicate entry check. 
* Inlined make-etc.nix since it's a trivial function.

svn path=/nixos/trunk/; revision=16728
 2009-08-16 13:14:33 +00:00
Eelco Dolstra 25dbf1594e * Updates for the new udev and util-linux-ng: fsck is now in 
util-linux-ng instead of e2fsprogs, blkid is in util-linux-ng, and
  we need to manually create /dev/.udev prior to starting udevd for
  some reason.

svn path=/nixos/trunk/; revision=16691
 2009-08-11 21:12:37 +00:00
Eelco Dolstra fd56f110da * Clean up some boot messages. 
svn path=/nixos/trunk/; revision=16689
 2009-08-11 21:09:25 +00:00
Eelco Dolstra bed6fd6a61 * `umount -f' causes lots of problems, so don't do it. 
svn path=/nixos/trunk/; revision=16688
 2009-08-11 21:08:05 +00:00
Eelco Dolstra 167ccdd537 * Move the firmware loader into a separate module. 
* services.udev.addFirmware -> hardware.firmware.

svn path=/nixos/trunk/; revision=16657
 2009-08-10 19:27:15 +00:00
Eelco Dolstra 0ab6be1c81 * Restarting dbus no longer seems to kill the X server. 
svn path=/nixos/trunk/; revision=16650
 2009-08-10 16:18:51 +00:00
Ludovic Courtès ac29ad197b stage-1-init: Remove timeout from `fail()'. 
Timeouts upon failure can be harmful, e.g., after a file system failure
that needs manual intervention.

svn path=/nixos/trunk/; revision=16637
 2009-08-10 09:20:05 +00:00
Eelco Dolstra 6802a75076 * nixos-rebuild: replaced some environment variables with options 
(e.g. --install-grub instead of $NIXOS_INSTALL_GRUB).  Also support
  some nix-build options (e.g. --show-trace and -j).

svn path=/nixos/branches/modular-nixos/; revision=16560
 2009-08-03 12:36:15 +00:00
Eelco Dolstra bc54061cba svn path=/nixos/branches/modular-nixos/; revision=16557 2009-08-03 12:17:23 +00:00
Michael Raskin 137ce0907c Some fixes in on-boot activation 
svn path=/nixos/branches/modular-nixos/; revision=16525
 2009-07-31 08:32:53 +00:00
Michael Raskin f05682c84d Give some progress indications during Stage2 boot 
svn path=/nixos/branches/modular-nixos/; revision=16523
 2009-07-31 04:56:52 +00:00
Michael Raskin 6aba79bed5 Update child configuration generation 
svn path=/nixos/branches/modular-nixos/; revision=16514
 2009-07-30 04:20:23 +00:00
Eelco Dolstra 6119c399d8 * Support tasks in the new Upstart formalism. 
* Swap task: fixed removing disabled swap devices.
* Swap task: specified the type of swapDevices.

svn path=/nixos/branches/modular-nixos/; revision=16396
 2009-07-16 14:51:49 +00:00
Eelco Dolstra 7cb4503ad6 * More Upstart refactoring. 
svn path=/nixos/branches/modular-nixos/; revision=16394
 2009-07-16 13:55:11 +00:00
Eelco Dolstra bb292fdf04 * Support post-stop actions. 
svn path=/nixos/branches/modular-nixos/; revision=16393
 2009-07-16 13:46:49 +00:00
Eelco Dolstra 889311f4ca * Refactored the sshd module. 
svn path=/nixos/branches/modular-nixos/; revision=16377
 2009-07-15 15:53:39 +00:00
Eelco Dolstra c45cf3a28e * In the jobs attribute, support a more high-level way of specifying 
jobs, e.g. (from the nscd job)

    { name = "nscd";

      description = "Name Service Cache Daemon";

      startOn = "startup";
      stopOn = "shutdown";

      environment = { LD_LIBRARY_PATH = nssModulesPath; };
        
      preStart =
        ''
          mkdir -m 0755 -p /var/run/nscd
          mkdir -m 0755 -p /var/db/nscd
        '';

      exec = "${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null";
    };

  The Upstart job is generated from this.  The main goal is to provide
  some abstraction from the Upstart syntax.  For instance, this should
  make it easier to upgrade to newer versions of Upstart, to switch to
  an entirely different process management system (e.g. initng or
  launchd), or to test a job independantly from Upstart.  (However the
  startOn and stopOn attributes are tied to Upstart's event model.)

svn path=/nixos/branches/modular-nixos/; revision=16376
 2009-07-15 15:24:11 +00:00
Eelco Dolstra 0e3bef4195 * Declare the type of jobs. 
svn path=/nixos/branches/modular-nixos/; revision=16375
 2009-07-15 13:41:00 +00:00
Eelco Dolstra 1424399002 * Simplify. 
svn path=/nixos/branches/modular-nixos/; revision=16373
 2009-07-15 12:52:32 +00:00
Eelco Dolstra 96fe3ba1b7 * Inline make-job.nix. 
svn path=/nixos/branches/modular-nixos/; revision=16372
 2009-07-15 11:38:17 +00:00
Eelco Dolstra 9d1e31117f * Get rid of the "users" and "groups" fields in jobs. 
svn path=/nixos/branches/modular-nixos/; revision=16371
 2009-07-15 11:34:55 +00:00
Eelco Dolstra ca8e00cafa * Got rid of the extraPath field in jobs (use 
environment.systemPackages instead).  Also renamed
  services.extraJobs to jobs.

svn path=/nixos/branches/modular-nixos/; revision=16370
 2009-07-15 11:19:11 +00:00
Eelco Dolstra def0be732f * job.extraHttpdConfig: not used anywhere. 
svn path=/nixos/branches/modular-nixos/; revision=16369
 2009-07-15 09:14:24 +00:00
Eelco Dolstra 118418ba31 * Refactoring the Upstart module. Got rid of job.extraEtc, it's 
redundant now (modules can just define environment.etc).

svn path=/nixos/branches/modular-nixos/; revision=16367
 2009-07-15 09:06:36 +00:00
Eelco Dolstra 9704472d1c Some hacks to support clean shutdowns of VMs that mount the Nix store 
ove QEMU (and other NixOS instances that use a remote filesystem like
NFS):

* Don't take down the network interfaces during shutdown.
* Don't try to unmount the Nix store.  Usually, this doesn't work
  because it's still in use, but on remote filesystems like CIFS the
  `-f' umount flag actually works.

svn path=/nixos/branches/modular-nixos/; revision=16036
 2009-06-24 13:33:03 +00:00
Eelco Dolstra 0b39f614e9 * Don't wait for CIFS "devices" (//share/path) to appear since they 
won't.  This speeds up booting from CIFS a lot.

svn path=/nixos/branches/modular-nixos/; revision=16023
 2009-06-22 14:44:48 +00:00
Eelco Dolstra 0f6d7c8862 * Use insmod from module_init_tools in the initrd, since the latest 
klibc no longer has it.

svn path=/nixos/branches/modular-nixos/; revision=16019
 2009-06-22 14:10:11 +00:00
Eelco Dolstra da77a6437f * qemu-vm.nix: automatically create and initialise the disk image if 
it doesn't already exist.  Also set up some ad hoc port forwarding
  from the host to the guest.

svn path=/nixos/branches/modular-nixos/; revision=16012
 2009-06-19 15:19:56 +00:00
Eelco Dolstra 9460a30851 * Use the fileSystems option to mount the host filesystem. Also, it 
seems that mount.cifs isn't actually needed (anymore?).

svn path=/nixos/branches/modular-nixos/; revision=16000
 2009-06-18 16:47:00 +00:00
Eelco Dolstra e08e7aedbc * Option boot.initrd.postMountCommands to specify additional shell 
commands for in stage 1 of the boot.

svn path=/nixos/branches/modular-nixos/; revision=15998
 2009-06-18 16:03:18 +00:00
Eelco Dolstra 16937dd23d * Make fsck on journaling filesystems optional (enabled by default). 
This is because fsck.ext3 takes several minutes to recover the
  journal, whereas the ext3 implementation in the kernel only takes a
  few seconds.  I'd love to know why this is the case...

svn path=/nixos/branches/modular-nixos/; revision=15965
 2009-06-15 16:47:37 +00:00
Eelco Dolstra 048e03377f * Don't try to run fsck on ISO-9660/UDF filesystems. 
svn path=/nixos/branches/modular-nixos/; revision=15963
 2009-06-15 15:50:36 +00:00
Eelco Dolstra ff58b5dede * Booting was broken when using the "label" option. 
svn path=/nixos/branches/modular-nixos/; revision=15957
 2009-06-14 11:08:44 +00:00
Nicolas Pierron 4001b66c88 Move the option declaration of filesystems.*.neededForBoot to boot/stage-1.nix. 
svn path=/nixos/branches/modular-nixos/; revision=15940
 2009-06-11 16:04:03 +00:00
Eelco Dolstra 1cea6b09ef * Compress the Nix store on the CD using squashfs. This reduces the 
size of the i686-linux ISO image from 463 MiB to 147 MiB.  Hopefully
  it also speeds up installation due to reduced seek time and larger
  block sizes, but I haven't tested that yet (on real hardware).

svn path=/nixos/branches/modular-nixos/; revision=15930
 2009-06-10 16:29:48 +00:00
Eelco Dolstra 31c6852403 * The menu.lst fragment in the top-level system derivation doesn't 
seem to be used anywhere.  Removed.

svn path=/nixos/branches/modular-nixos/; revision=15928
 2009-06-10 16:05:25 +00:00
Eelco Dolstra e940f1fbd7 * Cleaned up the error messages in the stage 1 init script. 
* Use the basename from coreutils rather than a bash hack.

svn path=/nixos/branches/modular-nixos/; revision=15927
 2009-06-10 15:02:39 +00:00
Eelco Dolstra 0a0260514d * Renamed boot.localCommands to boot.postBootCommands since it wasn't 
such a good name (local to what?).

svn path=/nixos/branches/modular-nixos/; revision=15879
 2009-06-05 16:02:58 +00:00
Eelco Dolstra f9cfe7c4ee * The activation script can't use /bin/sh as its interpreter because 
it creates the /bin/sh symlink, which may not exist yet (esp. when
  booting from CD).

svn path=/nixos/branches/modular-nixos/; revision=15875
 2009-06-05 15:03:56 +00:00
Eelco Dolstra d6617f0d5e svn path=/nixos/branches/modular-nixos/; revision=15866 2009-06-05 13:24:23 +00:00
Eelco Dolstra 234c4340c2 * helpers -> lib. 
svn path=/nixos/branches/modular-nixos/; revision=15797
 2009-05-29 14:46:27 +00:00
Eelco Dolstra c6c9304b95 * system/options.nix: gone :-) 
svn path=/nixos/branches/modular-nixos/; revision=15772
 2009-05-28 16:03:48 +00:00
Eelco Dolstra 29611e49fd * More cleanup. 
svn path=/nixos/branches/modular-nixos/; revision=15768
 2009-05-28 13:36:38 +00:00
Eelco Dolstra 3c84d56273 * Move the /etc generation to modules/system/etc. 
svn path=/nixos/branches/modular-nixos/; revision=15767
 2009-05-28 13:17:56 +00:00
Eelco Dolstra ec55562ec3 * Move the configuration of the pwdutils (passwd, useradd etc.) to 
modules/programs/pwdutils.
* Renamed config.system.shell to config.users.defaultUserShell and
  updated the description to make clear it has to be a non-store
  path.

svn path=/nixos/branches/modular-nixos/; revision=15761
 2009-05-28 12:24:56 +00:00
Eelco Dolstra 05a08adf91 * Move the dhclient exit hooks file to the dhclient module, where it 
belongs.

svn path=/nixos/branches/modular-nixos/; revision=15755
 2009-05-27 23:30:29 +00:00
Eelco Dolstra 3c6ae39a0d * Refactoring: moved some options out of system/options.nix (almost 
empty now), do more of bashrc.sh declaratively, and moved nsswitch
  generation to modules/config/nsswitch.nix.

svn path=/nixos/branches/modular-nixos/; revision=15754
 2009-05-27 23:14:38 +00:00
Eelco Dolstra c3fb0387b4 * Moved the expressions for generating Upstart jobs. 
svn path=/nixos/branches/modular-nixos/; revision=15748
 2009-05-27 10:32:30 +00:00
Eelco Dolstra 700a1f8f21 * Move the modulesTree and modprobe options to the kernel.nix module. 
svn path=/nixos/branches/modular-nixos/; revision=15747
 2009-05-27 09:57:30 +00:00
Eelco Dolstra 690416cf1a * Move initrd-related options to the appropriate module. 
svn path=/nixos/branches/modular-nixos/; revision=15746
 2009-05-27 09:46:50 +00:00
Eelco Dolstra 68c3132f46 * Move the activation scripts to the appropriate module. 
svn path=/nixos/branches/modular-nixos/; revision=15745
 2009-05-27 09:40:55 +00:00
Eelco Dolstra 98cce35041 * Turn the top-level derivation of a NixOS configuration ("system") 
into a NixOS module (modules/system/activation/top-level.nix -
  couldn't think of a better name).  The top-level derivation is
  returned in config.system.build.system.
* Inlined system.sh in top-level.nix so that we don't have to pass
  everything through environment variables.

svn path=/nixos/branches/modular-nixos/; revision=15740
 2009-05-27 09:00:45 +00:00
Eelco Dolstra 7ac0b3aaea * Make modules/system/boot/stage-1.nix a proper module that exports 
the initial ramdisk as config.system.build.bootStage1.

svn path=/nixos/branches/modular-nixos/; revision=15739
 2009-05-27 08:14:06 +00:00
Eelco Dolstra 278b15d840 * More moving. 
svn path=/nixos/branches/modular-nixos/; revision=15725
 2009-05-25 14:19:33 +00:00