Eelco Dolstra
45f0de21f0
nixos-rebuild: Fix the check for running nix-daemon
2012-12-21 00:18:12 +01:00
Shea Levy
75ec5c609e
Merge remote-tracking branch 'upstream/master' into systemd
...
Conflicts:
maintainers/scripts/ec2/create-ebs-amis.py
2012-12-17 13:03:56 -05:00
Shea Levy
d19c223ba6
Simplify unionfs-chroot bind-mounting
2012-12-16 13:07:42 -05:00
Shea Levy
e34024d998
Refactor common unionfs-fuse initrd prep into a separate module
2012-12-16 12:33:36 -05:00
Shea Levy
be4f69519b
iso-image: Use unionfs-fuse instead of aufs
2012-12-16 11:31:52 -05:00
Lluís Batlle i Rossell
dacd7d5a58
Setting iso_new_kernel to use linux 3.7.
...
It was using 3.2, the same kernel as the other isos.
2012-12-16 16:05:50 +01:00
Florian Friesdorf
14483c0bf9
update nixos channel path
2012-12-14 18:24:41 +01:00
Eelco Dolstra
97ae408e83
Merge remote-tracking branch 'origin/master' into systemd
2012-12-11 17:40:39 +01:00
Eelco Dolstra
13617b803b
Use the binary cache in the installer
...
Also remove "nixos-rebuild pull".
2012-12-08 19:00:06 +01:00
Eelco Dolstra
b1da38f564
Merge remote-tracking branch 'origin/master' into systemd
2012-11-30 16:12:04 +01:00
Lluís Batlle i Rossell
04963cf802
system-tarball-pc: fixing the readme inclusion
2012-11-29 11:29:15 +01:00
Eelco Dolstra
994a15bc25
nixos-rebuild: Handle options with spaces in them
...
Like ‘--option binary-caches "http://foo http://bar "’
2012-11-22 12:04:00 +01:00
Eelco Dolstra
f44d27a96c
Make the installer work on systemd
...
Systemd mounts the root filesystem as a shared subtree, which breaks
recursive bind mounts.
2012-11-15 22:53:57 +01:00
Eelco Dolstra
08e6c0cb7c
Update channel URLs
2012-11-12 09:19:25 +01:00
Lluís Batlle i Rossell
64540fb453
Adding quick instructions in system-tarball-pc to use it as chroot.
...
I also split the readme into a file apart.
2012-11-04 22:13:19 +01:00
Eelco Dolstra
458f36f5f1
Turn fileSystems into an attribute set
...
So now you can write
fileSystems =
[ { mountPoint = "/";
device = "/dev/sda1";
}
];
as
fileSystems."/".device = "/dev/sda1";
2012-11-02 18:02:12 +01:00
Eelco Dolstra
74be2d9707
ISO image: Fix graphical GRUB menu
2012-10-04 16:14:44 -04:00
Eelco Dolstra
75583c7984
nixos-rebuild: Support --option
2012-09-14 13:23:19 -04:00
Shea Levy
15a1efe023
find modules/ -name \*.nix -print0 | xargs -0 sed -i 's/RT73Firmware/RalinkFirmware/g'
2012-08-11 12:34:35 -04:00
Eelco Dolstra
b52117c34d
Treat init-script as a boot loader
2012-07-25 11:30:16 -04:00
Eelco Dolstra
8b91a5f2ff
Move boot loader modules to modules/system/boot/loader
2012-07-25 10:59:03 -04:00
Eelco Dolstra
b15e1fbb08
Boot loader refactoring
...
- Renamed system.build.menuBuilder to system.build.installBootLoader.
- ‘install-grub.pl’ (formerly grub-menu-builder.pl) now generates the
GRUB menu *and* installs GRUB (if necessary).
- ‘switch-to-configuration.sh’ has no boot loader specific knowledge
anymore. It just calls installBootLoader.
2012-07-25 10:47:32 -04:00
Eelco Dolstra
1b743526bd
grub.nix: Handle null values
...
http://hydra.nixos.org/build/2894714
2012-07-25 09:27:51 -04:00
Eelco Dolstra
be4c4d79cf
grub-menu-builder: GRUB now installs unicode.pf2 automatically
2012-07-24 22:37:16 -04:00
Eelco Dolstra
fb15b1894e
Add missing progress message
2012-07-24 19:27:16 -04:00
Eelco Dolstra
f07f221f0e
Replace grub-menu-builder with a much faster version
...
The old GRUB menu builder script is quite slow, typically taking
several seconds. This is a real annoyance since it's run every time
you switch to a new configuration. Therefore this patch replaces the
Bash script with a much faster Perl script. In a VirtualBox test, the
execution time went from 2.7s to 0.1s. The Perl version is also more
correct because it uses XML to get the GRUB configuration (through
builtins.toXML), so there are no shell escaping issues.
The new script currently lacks support for subconfigurations defined
through "nesting.children".
2012-07-24 19:16:27 -04:00
Shea Levy
0f65521df2
Merge pull request #17 from MarcWeber/fix-init-script-builder
...
fix init-script-builder
2012-07-23 17:44:37 -07:00
Marc Weber
3221159f5f
fix init-script-builder
2012-07-21 19:26:36 +02:00
Eelco Dolstra
73532c3855
Global replace /var/run/current-system -> /run/current-system
2012-07-16 11:34:21 -04:00
Mathijs Kwik
a630b1f6f6
EFI shell got updated upstream, reflecting new hash
2012-07-05 08:31:44 +02:00
Eelco Dolstra
348691645d
Remove broken "nopipefail" option
...
http://hydra.nixos.org/build/2751337
2012-07-02 10:57:36 -04:00
Eelco Dolstra
76c74cd7c7
initrd: Detect filesystem type before doing fsck/mount
...
BusyBox doesn't handle the "auto" filesystem type very well: fsck will
just ignore such filesystems, and mount will only work properly if the
required kernel module is already loaded. Therefore, use blkid to
determine the filesystem type.
Also generate an /etc/fstab in the initrd rootfs on the fly. This is
useful if you're dropped into an emergency shell since it allows you
to say "fsck /dev/sda1" or "mount /dev/sda" and have the right thing
happen.
2012-06-28 10:55:44 -04:00
viric
7acfd8ec20
Merge pull request #9 from viric/pull-pipefail
...
nixos-rebuild: make 'pull' fail in case it did not pull anything.
2012-06-28 01:20:22 -07:00
Lluís Batlle i Rossell
34e8f68056
system-tarball-pc: not use boot.initrd.extraTools anymore
...
Eelco removed the option recently, making the default initrd have the full
busybox.
I saw this evaluation error in the hydra nixos trunk page.
2012-06-27 22:26:27 +02:00
Lluís Batlle i Rossell
de87b07bb3
nixos-rebuild: fail if any case of pull fails.
2012-06-27 21:57:15 +02:00
Lluís Batlle i Rossell
5b7c019e2a
nixos-rebuild: make 'pull' fail in case it did not pull anything.
2012-06-27 21:36:46 +02:00
Eelco Dolstra
cc357c7e64
nixos-rebuild: Add a convenience option ‘--upgrade’
...
This is equivalent to running ‘nix-channel --update nixos’ before
running ‘nixos-rebuild’.
2012-06-25 16:17:34 -04:00
Eelco Dolstra
1da7cea223
Add Busybox to the installation CD
...
This is mostly to get the automated tests to succeed.
2012-06-22 14:16:55 -04:00
Eelco Dolstra
598adfee3e
Fix booting from the CD-ROM
...
So it turns out that BusyBox doesn't auto-load modules for filesystems
that have type "auto", e.g. it doesn't figure out that it should load
the "iso9660" module should be loaded when mounting the CD-ROM. We
don't want to give the root FS on the CD type "iso9660", because that
breaks booting from a USB stick created by unetbootin. So make sure
the "iso9660" module is loaded.
2012-06-22 11:55:23 -04:00
Eelco Dolstra
7b54922227
Don't include klibc in the installation CD
2012-06-22 11:39:27 -04:00
Lluís Batlle i Rossell
31f30722d6
Small comment fix on the system-tarball-sheevaplug.
...
svn path=/nixos/trunk/; revision=34418
2012-06-10 14:45:30 +00:00
Eelco Dolstra
f2a33809c1
* Check for .git instead of .svn.
...
svn path=/nixos/trunk/; revision=34350
2012-06-04 15:57:32 +00:00
Eelco Dolstra
a0cc181117
* nixos-checkout: get the NixOS/Nixpkgs sources from GitHub.
...
svn path=/nixos/trunk/; revision=34347
2012-06-04 15:39:07 +00:00
Eelco Dolstra
c4c68f97d1
* The volume ID is too long again. Shorten it to make it fit (just
...
barely) inside the 32 character limit.
http://hydra.nixos.org/build/2660387
svn path=/nixos/trunk/; revision=34346
2012-06-04 15:02:37 +00:00
Eelco Dolstra
f81eb12d41
* Now hopefully a proper fix for the problem in
...
http://hydra.nixos.org/build/2645533 (which I can't reproduce btw -
so much for reproducibility...).
svn path=/nixos/trunk/; revision=34243
2012-05-25 14:06:46 +00:00
Eelco Dolstra
d0786fd3e7
* Cache nix-pull calls in nixos-install.
...
svn path=/nixos/trunk/; revision=34241
2012-05-25 13:32:30 +00:00
Lluís Batlle i Rossell
22fc2bdb24
Fixing the evaluation of the system-tarball-pc.
...
It complained that grub device wasn't defined, and I guess it wanted some
fileSystems too. I copied those details from the sheevaplug expression, that I
made evaluate some minutes ago.
svn path=/nixos/trunk/; revision=34238
2012-05-25 08:09:25 +00:00
Lluís Batlle i Rossell
4157166f8a
Making the sheevaplug system tarball evaluate fine again. It had some pieces not up to date:
...
fileSystems definition, kernel version, ...
svn path=/nixos/trunk/; revision=34237
2012-05-25 07:52:12 +00:00
Eelco Dolstra
a3e04ba0aa
* Fix problems with repeated installations due to the immutable bit
...
(http://hydra.nixos.org/build/2645533 ).
svn path=/nixos/trunk/; revision=34235
2012-05-25 02:30:52 +00:00
Eelco Dolstra
b11770373a
* Work properly if /root/.nix-defexpr/channels already exists.
...
svn path=/nixos/trunk/; revision=34233
2012-05-24 23:37:06 +00:00