Commit Graph

121 Commits

Author SHA1 Message Date
Ludovic Courtès
018cb283f2 Fix `grub-menu-builder.sh'.
Previously, since `nullglob' is active, `$(ls /boot/kernels/*)'
would translate into `$(ls)' when `/boot/kernels' is empty, which
would then lead to the removal of all the files under $PWD.

Additionally, if `/boot/kernels' was not empty, `$fn' would contain
only the basename of the files, whereas `$filesCopied' is indexed
by full paths.


svn path=/nixos/trunk/; revision=15548
2009-05-11 11:54:18 +00:00
Michael Raskin
5b368b22bf An option for times when I only want to init Nix in chroot and build system semi-manually.
svn path=/nixos/trunk/; revision=15509
2009-05-09 07:34:20 +00:00
Michael Raskin
5cbcb9762d More correct handling of services tarball
svn path=/nixos/trunk/; revision=15508
2009-05-09 07:31:56 +00:00
Eelco Dolstra
05a7e1368a * grub-menu-builder.sh: with copyKernels = true, don't delete all of
/boot/kernels and then copy all the kernels/initrds.  Instead, copy
  only the kernels/initrds that don't exist yet in /boot/kernels, then
  delete obsolete files in /boot/kernels.  Also, use slightly nicer
  file names in /boot/kernels.

svn path=/nixos/trunk/; revision=15505
2009-05-08 11:33:22 +00:00
Michael Raskin
e4a1748226 Port main functionality of rescue-cd-configurable into rescue-cd.nix as a set of small fixes. Rogue, manual are now ordinary jobs. It is possible to include build dependencies. It is possible to choose one of a few configurations in the boot menu. Of course, configuration overrides may be passed
svn path=/nixos/trunk/; revision=15430
2009-05-03 11:37:20 +00:00
Marc Weber
2470db9d74 also add uhci_hcd, thanks to ugo @ irc
svn path=/nixos/trunk/; revision=15413
2009-04-30 12:21:41 +00:00
Eelco Dolstra
2cd1e7239f * Atomically update grub/menu.lst (although we really need an fsync here).
svn path=/nixos/trunk/; revision=15368
2009-04-28 13:43:03 +00:00
Eelco Dolstra
5ac2532cc7 * Add GNU parted to the CD.
svn path=/nixos/trunk/; revision=15274
2009-04-23 12:56:17 +00:00
Eelco Dolstra
453e9abc9e * Work around an apparent bug in Bash 4.0. It no longer accepts this:
echo $(cat <<EOF
    bla
    EOF)

  It does accept backticks:

    echo `cat <<EOF
    bla
    EOF`

svn path=/nixos/trunk/; revision=15192
2009-04-20 16:26:50 +00:00
Marc Weber
ed43363e2a following renaming whatis -> showVal
svn path=/nixos/trunk/; revision=15145
2009-04-19 10:36:30 +00:00
Eelco Dolstra
760f484e4d * Removed some more stuff from the CD because the x86_64-linux ISO is
over 700 MB.  (Maybe vim could be replaced by a smaller vi?)
  Note that the main size problem for the x86_64-linux ISO is that it
  contains two Glibcs - Grub has a dependency on the 32-bit Glibc.  It
  would be nice to get rid of that.

svn path=/nixos/trunk/; revision=15074
2009-04-16 08:24:38 +00:00
Eelco Dolstra
723be3579d * Remove gdb from the CD.
svn path=/nixos/trunk/; revision=15062
2009-04-15 11:51:37 +00:00
Eelco Dolstra
7409bb9ec1 * Use Linux 2.6.28 on the installation CD.
svn path=/nixos/trunk/; revision=15061
2009-04-15 10:13:37 +00:00
Eelco Dolstra
b470feb916 * nixpkgsPath -> nixpkgs.
svn path=/nixos/trunk/; revision=14702
2009-03-25 15:47:29 +00:00
Eelco Dolstra
70f9a365d8 * Add ntfsprogs to the installation CD (mostly for ntfsresize).
svn path=/nixos/trunk/; revision=14697
2009-03-25 11:00:31 +00:00
Eelco Dolstra
3d8df9802d * exportBuildReferencesGraph -> exportReferencesGraph.
svn path=/nixos/trunk/; revision=14593
2009-03-18 18:10:38 +00:00
Michael Raskin
f767f1bea8 Updating LiveDVD with X expressions
svn path=/nixos/trunk/; revision=14251
2009-02-25 21:15:35 +00:00
Michael Raskin
9e29c72bd2 Automated install is once more succesful
svn path=/nixos/trunk/; revision=14229
2009-02-24 16:19:29 +00:00
Marc Weber
a2a092db87 added possibility make nixos-install not downlooad the manifest
do so by export NIXOS_PULL=0 (same as in nixos-rebuild)

svn path=/nixos/trunk/; revision=14129
2009-02-19 15:40:53 +00:00
Marc Weber
018c99ec1c added sshfsFuse and screen to rescue-cd.nix
sshsfsFuse so that you can get packages from another machine easily
screen so that you can copy paste easily

svn path=/nixos/trunk/; revision=14128
2009-02-19 15:12:39 +00:00
Marc Weber
53cd42dba6 commented out theme because url is broken
svn path=/nixos/trunk/; revision=14127
2009-02-19 15:12:30 +00:00
Eelco Dolstra
9c0953b439 svn path=/nixos/trunk/; revision=13652 2008-12-17 14:30:43 +00:00
Michael Raskin
23551d0a4d some modules..
svn path=/nixos/trunk/; revision=13419
2008-11-25 18:00:25 +00:00
Eelco Dolstra
3a9700b226 * Include the kernel version in the description for
each Grub menu entry.  (Ideally, we would show
  what changed between each entry, e.g. "KDE upgraded to 4.1",
  but that would be hard to do generically.)

svn path=/nixos/trunk/; revision=13146
2008-10-29 13:24:00 +00:00
Michael Raskin
1d55390e1c An option for XRandr support. Use it for dualhead ATi (and probably Intel) cards.
svn path=/nixos/trunk/; revision=13109
2008-10-24 10:30:38 +00:00
Marc Weber
d438b972b1 nixos-rebuild: take NIXPKGS location from env, too
svn path=/nixos/trunk/; revision=12981
2008-10-06 23:23:28 +00:00
Michael Raskin
f03fed54e0 Now automated test runs - installs and boots NixOS - on my computer. Some minor issue with socat transferring report from virtual machine to host, though.
svn path=/nixos/trunk/; revision=12830
2008-09-08 22:36:11 +00:00
Michael Raskin
88be528d9d Updating rescue-cd-configurable to match rescue-cd.nix updates
svn path=/nixos/trunk/; revision=12829
2008-09-08 21:08:20 +00:00
Michael Raskin
75dc712c59 Added virtio modules to module list for rescue CD variations.
svn path=/nixos/trunk/; revision=12828
2008-09-08 21:07:49 +00:00
Eelco Dolstra
212d5ceff5 * Don't generate a manifest for the CD anymore, just use the
copy-from-other-stores substituter to copy paths directly from the
  Nix store on the CD.

svn path=/nixos/trunk/; revision=12826
2008-09-08 12:40:05 +00:00
Eelco Dolstra
5e88ff8269 * Fix relative paths.
svn path=/nixos/trunk/; revision=12823
2008-09-08 09:36:54 +00:00
Eelco Dolstra
21ee887b75 * Renamed `configuration' to something more descriptive.
svn path=/nixos/trunk/; revision=12822
2008-09-08 08:51:09 +00:00
Eelco Dolstra
5fb3cdc82b * Typo.
svn path=/nixos/trunk/; revision=12762
2008-08-29 09:26:30 +00:00
Eelco Dolstra
c34c703040 * Don't use camel case for filenames.
* "by env overridable settings" is not good English :-)

svn path=/nixos/trunk/; revision=12732
2008-08-27 09:37:44 +00:00
Marc Weber
4eceb15830 fix typos, moved nixos-checkout code into its own file
following some other suggestions made by niksnut
added further PATH hint in repos description of options.nix

svn path=/nixos/trunk/; revision=12730
2008-08-26 19:45:06 +00:00
Marc Weber
b0b4c0e2b3 echo working copies beeing used when calling showSyntax (help output)
svn path=/nixos/trunk/; revision=12729
2008-08-26 19:44:54 +00:00
Marc Weber
67b1b9af80 rewritten nixos-checkout code.
You can now define multiple repositories. See options.nix

svn path=/nixos/trunk/; revision=12645
2008-08-17 01:11:57 +00:00
Eelco Dolstra
64fc690afa * Make that dry-run' (as an action) instead of --dry-run'.
svn path=/nixos/trunk/; revision=12488
2008-08-04 15:04:06 +00:00
Eelco Dolstra
3ea5264b1b * Option `--dry-run' to see what's going to be built.
* Properly parse the command line arguments before doing anything
  (reported by Andres).

svn path=/nixos/trunk/; revision=12486
2008-08-04 14:58:26 +00:00
Eelco Dolstra
a66248e2a2 * Fix extraGrubEntriesBeforeNixos, it always placed the extra entries
before the default (so I suddenly found myself booting into 
  Windows...).  BTW it would be better to have string-valued options
  like extraGrubEntriesBefore / extraGrubEntriesAfter or something 
  like that.

svn path=/nixos/trunk/; revision=12401
2008-07-23 09:10:19 +00:00
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