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

202 commits

Author SHA1 Message Date
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
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 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
Nicolas Pierron d2d139e920 Move the generation of the dummy configuration file into the installation 
device profile.

TODO: The current configuration does not reproduce exactly the CD
configuration, fix it.

svn path=/nixos/trunk/; revision=23913
 2010-09-25 09:32:48 +00:00
Nicolas Pierron 112cd0c4d4 Add an installation device profile, and use it it the basic installation CD. 
svn path=/nixos/trunk/; revision=23912
 2010-09-25 09:32:43 +00:00
Nicolas Pierron cf103b8d4d Add 2 index file to define the default case for detected and not-detected 
devices.  These are used to replace hand made listings in the basic
installation CD.

The configuration file, which is generated by nixos-hardware-scan, enables
not-detected devices by default.

svn path=/nixos/trunk/; revision=23911
 2010-09-25 09:32:37 +00:00
Nicolas Pierron c90a7b9be4 Remove duplicated (modules-list) includes from the basic installation cd. 
svn path=/nixos/trunk/; revision=23910
 2010-09-25 09:32:32 +00:00
Nicolas Pierron d304d12f37 Extract a base profile from the basic installation cd. 
svn path=/nixos/trunk/; revision=23909
 2010-09-25 09:32:27 +00:00
Lluís Batlle i Rossell c1e4586ed1 Again trying to get the kernelFile paths right 
svn path=/nixos/branches/stdenv-updates/; revision=23836
 2010-09-17 17:25:46 +00:00
Lluís Batlle i Rossell 743b75fbaf Making the fuloong2f system-tarball more specific for the fuloong, so, helping in how 
to use the system more easily.


svn path=/nixos/branches/stdenv-updates/; revision=23826
 2010-09-16 19:26:34 +00:00
Lluís Batlle i Rossell 3b216865d2 Writing better some sheevaplug system-tarball lines (kernel parameters in a single line, for example) 
svn path=/nixos/branches/stdenv-updates/; revision=23825
 2010-09-16 19:25:29 +00:00
Lluís Batlle i Rossell 83d012ba13 Trying to fix again system-tarball-pc (again, the kernel file name) 
svn path=/nixos/branches/stdenv-updates/; revision=23824
 2010-09-16 19:24:52 +00:00
Lluís Batlle i Rossell 7672c36a70 Trying to get system-tarball-pc build properly. 
svn path=/nixos/branches/stdenv-updates/; revision=23814
 2010-09-15 21:36:56 +00:00
Eelco Dolstra c4f910f550 * Substitute the path of the system derivation directly in the stage 2 
init script.  This removes the need for the `systemConfig' boot
  parameter; `init=<stage-2-init>' is enough.  However, the GRUB menu
  builder still needs to add `systemConfig' to the kernel command line
  for compatibility with old configurations.

svn path=/nixos/trunk/; revision=23775
 2010-09-13 22:10:25 +00:00
Lluís Batlle i Rossell 245df33c6c Making the system tarballs of fuloong and sheevaplug reference the proper nixpkgs, and not that of /etc/... 
svn path=/nixos/branches/stdenv-updates/; revision=23772
 2010-09-13 20:52:49 +00:00
Lluís Batlle i Rossell 9ba735714a Adding a system-tarball expression for the sheevaplug (which a previous commit already put a reference to) 
svn path=/nixos/branches/stdenv-updates/; revision=23690
 2010-09-08 17:15:31 +00:00
Lluís Batlle i Rossell ccf7852e11 Updating the system-tarball work, having just tested that of the fuloong2f. 
svn path=/nixos/branches/stdenv-updates/; revision=23689
 2010-09-08 16:53:36 +00:00
Nicolas Pierron c9dc3651da Replace mkOverride by its alias mkOverrideTemplate to remove the unused 
template argument of mkOverride later.

svn path=/nixos/trunk/; revision=23631
 2010-09-03 19:10:59 +00:00
Michael Raskin 597e083d82 Adding an option to include build dependencies into ISO image 
svn path=/nixos/trunk/; revision=23502
 2010-08-29 12:11:31 +00:00
Eelco Dolstra cbc05c1480 * Enable wpa_supplicant on the installation CD. 
svn path=/nixos/trunk/; revision=23034
 2010-08-08 13:55:35 +00:00
Eelco Dolstra e8e7ee356c * In the installation CD, pass the label of the CD through the 
root=... kernel command line parameter, instead of hard-coding it in
  `fileSystems'.  This is to allow CD-to-USB converters such as
  UNetbootin to rewrite the kernel command line to the label or UUID
  of the USB stick.

svn path=/nixos/trunk/; revision=23024
 2010-08-07 14:16:18 +00:00
Eelco Dolstra d7d2d5e3d5 * Add some NLS modules required to mount FAT filesystems. We need 
this to boot the NixOS installer from a USB stick.

svn path=/nixos/trunk/; revision=23019
 2010-08-06 23:09:37 +00:00
Eelco Dolstra 05fc10f3a8 * Add dosfstools to the installation CD (for 
{mkfs,fsck}.{vfat,msdos}).

svn path=/nixos/trunk/; revision=23006
 2010-08-06 18:52:00 +00:00
Eelco Dolstra baf54c517d * Fix the terminal_output command. (This used to work but not with 
the latest GRUB I guess.)

svn path=/nixos/trunk/; revision=22575
 2010-07-13 11:48:40 +00:00
Eelco Dolstra ca1910e4b0 * Seems that we don't need the aufs2 mount helper. 
svn path=/nixos/trunk/; revision=22038
 2010-05-28 09:35:24 +00:00
Eelco Dolstra f9f224972a * Use AUFS2. 
svn path=/nixos/trunk/; revision=22033
 2010-05-28 07:09:34 +00:00
Yury G. Kudryashov 2dfd9b51ae gnupg2 is now called gnupg 
svn path=/nixos/trunk/; revision=21889
 2010-05-19 21:11:46 +00:00
Eelco Dolstra c1e313b5e1 * Remove obsolete references to kernelPackages in Nixpkgs. 
svn path=/nixos/trunk/; revision=20647
 2010-03-16 12:10:06 +00:00
Ludovic Courtès 8e16742b79 Update users of `services.sshd'. 
svn path=/nixos/trunk/; revision=20575
 2010-03-11 17:02:53 +00:00
Ludovic Courtès bcd3cd85f3 installation-cd: Add an `installer.basePackages' option. 
svn path=/nixos/trunk/; revision=20573
 2010-03-11 17:02:36 +00:00
Lluís Batlle i Rossell 093b51a562 Removing references to linux kernel 'vmlinuz', and making them point to 'bzImage'. 
That should match with a related change in nixpkgs.


svn path=/nixos/trunk/; revision=20095
 2010-02-18 11:35:39 +00:00
Lluís Batlle i Rossell 1dd3162d7c First attempt at trying to get a tarball of a bootable nixos system. 
What I want with this derivation is to allow the sheevaplug nixos to
build a tarball with all the needed files to boot. Then, this can be
unpacked into an SD card, or into a NFS/TFTP server, and then the
user can boot the system with help of the uboot console.
By now, I have only tried to build the tarball in a PC, in order
to develop the nix expressions quicker.

There is nothing written specialy for the Sheevaplug in all this,
by now.


svn path=/nixos/trunk/; revision=20035
 2010-02-15 23:27:51 +00:00
Lluís Batlle i Rossell 13ee735395 Making nixos work well with the new names 'linuxPackages' in stdenv-updates, additionally 
to the nixpkgs trunk 'kernelPackages'.
Seeing a strange kernelPackages mentioned in installation-cd-rescue (2.6.31_something) I
update that to 2.6.32.


svn path=/nixos/trunk/; revision=19443
 2010-01-14 19:50:49 +00:00
Eelco Dolstra 5c66611f3e svn path=/nixos/trunk/; revision=19333 2010-01-10 18:34:32 +00:00
Eelco Dolstra 39796e26b4 * Removed the boot.isLiveCD option. Moved the code for mounting a 
tmpfs on top of the CD to iso-image.nix.

svn path=/nixos/trunk/; revision=19318
 2010-01-09 15:13:06 +00:00
Eelco Dolstra 83478a0800 * Add klibc and klibcShrunk to the CD because they're always needed 
during an installation.

svn path=/nixos/trunk/; revision=19273
 2010-01-06 20:51:10 +00:00
Eelco Dolstra 1b21115f61 * Support creating a virtual disk in the test driver. 
svn path=/nixos/trunk/; revision=19263
 2010-01-06 14:37:23 +00:00
Eelco Dolstra 1da72333d9 * Put the NixOS boot at the top so that it's the default. 
svn path=/nixos/trunk/; revision=19255
 2010-01-06 12:24:20 +00:00
Eelco Dolstra 790368e315 * Removed installation-cd-minimal-fresh-kernel.nix since the kernel in 
installation-cd-minimal.nix is now 2.6.32.  Added most of its extra
  tools to installation-cd-base.nix.
* Put memtest86 at the bottom of the GRUB menu.  (There is currently
  no good way to do this other than to change the module inclusion
  order.)

svn path=/nixos/trunk/; revision=19188
 2010-01-03 17:13:30 +00:00
Eelco Dolstra 21216b0461 * Move some kernel modules around. 
svn path=/nixos/trunk/; revision=19187
 2010-01-03 16:29:17 +00:00
Eelco Dolstra 64c75274e1 * Use Linux 2.6.32 on the installation CD. 
svn path=/nixos/trunk/; revision=19166
 2010-01-01 16:26:01 +00:00
Eelco Dolstra aa445933a7 * Include some more firmware in the installation CD. 
svn path=/nixos/trunk/; revision=19007
 2009-12-16 23:52:02 +00:00
Marc Weber 4b5864666e * refactoring kvm test and bootstrapping image. 
expose makeInfo (used by test now)
  expose config hack
* Adding tests to release.nix
* fixes
* removing dependency on perl

refactoring details:
Move all configuration modules used by the NixOS installation test script
into one directory.

svn path=/nixos/trunk/; revision=18982
 2009-12-15 23:26:52 +00:00
Eelco Dolstra 6c9059e717 * Added an option `boot.initrd.availableKernelModules' that specifies 
modules that should be added to the initrd, but should only be
  loaded on demand (e.g. by the kernel or by udev).  This is
  especially useful in the installation CD, where we now only load the
  modules needed by the hardware.
* Enable automatic modprobing by udev in the initrd.

svn path=/nixos/trunk/; revision=18975
 2009-12-15 16:38:20 +00:00
Eelco Dolstra a612fd0d5e * Obsoleted boot.initrd.extraKernelModules (use 
boot.initrd.kernelModules instead).

svn path=/nixos/trunk/; revision=18969
 2009-12-15 14:05:01 +00:00
Marc Weber 401fd84ae1 kvm installation test update + NixOS installation archive 
You can run the kvm nixos installation test by:
  nix-build --no-out-link tests/test-nixos-install-from-cd.nix
It boots the installed system.
It still fails sshd isn't started (yet)

adding nixos-bootstrapping-archive:
You can install NixOS easily using any live cd now.
See README-BOOTSTRAP-NIXOS

svn path=/nixos/trunk/; revision=18950
 2009-12-15 06:37:32 +00:00
Marc Weber 4d7e344f69 Adding initial version of the nixos cd insallation test script using 
qemu_kvm. Installation doesn't take place yet. VM is started
printing a remote controlled "Hello".

This serves as example how to run a vm within a bulid job.

svn path=/nixos/trunk/; revision=18887
 2009-12-11 00:51:13 +00:00
Marc Weber 086c3d6328 making default and timeout of grub overridable 
also updating grub option names to current names

svn path=/nixos/trunk/; revision=18886
 2009-12-11 00:51:07 +00:00
Eelco Dolstra aa9d0a067e * Sync with the trunk. 
svn path=/nixos/branches/upstart-0.6/; revision=18408
 2009-11-18 11:50:06 +00:00
Michael Raskin f9958cbb44 Update kernel version for fresh-kernel 
svn path=/nixos/trunk/; revision=18379
 2009-11-17 09:00:49 +00:00
Eelco Dolstra c1b008b4e3 * Don't build the Grub menu builder script on the ISO. Then we don't 
the /init and /system symlinks on the CD (since it removes the
  cyclic dependency between building the Grub menu and the system
  derivation).

svn path=/nixos/branches/upstart-0.6/; revision=18344
 2009-11-14 16:12:02 +00:00
Eelco Dolstra 7621b40d56 * Provide a 640x480 background image for GRUB 2. 
* Turn on the graphical GRUB boot screen for the installation CD.

svn path=/nixos/branches/upstart-0.6/; revision=18340
 2009-11-13 16:45:41 +00:00
Eelco Dolstra 091631b433 * Use Grub 2 on the installation CD. No graphics yet. 
svn path=/nixos/branches/upstart-0.6/; revision=18325
 2009-11-10 21:42:38 +00:00
Michael Raskin 35abca4e7a Forward-port sshd fixes to iso-minimal-fresh-kernel. By the way, maybe we should finalyy decide what to do with kernel update and corresponding ISO update (to fresh-kernel proposal or otherwise) 
svn path=/nixos/trunk/; revision=17840
 2009-10-16 04:27:59 +00:00
Eelco Dolstra da5f745603 * You need an override here, otherwise bad things happen. 
svn path=/nixos/trunk/; revision=17831
 2009-10-15 14:32:15 +00:00
Eelco Dolstra e055085ac1 svn path=/nixos/trunk/; revision=17823 2009-10-15 12:32:33 +00:00
Marc Weber ba496e25c4 allow starting of sshd using "start sshd" - but don't start it on 
startup automatically because root password is empty by default.

svn path=/nixos/trunk/; revision=17811
 2009-10-14 21:48:12 +00:00
Marc Weber e611266285 Revert "add /root/my-firmware to the list of firmware directories" 
This reverts rev 17809  - I missed the update

svn path=/nixos/trunk/; revision=17810
 2009-10-14 21:44:25 +00:00
Marc Weber 70b4e1a371 add /root/my-firmware to the list of firmware directories 
svn path=/nixos/trunk/; revision=17809
 2009-10-14 21:35:39 +00:00
Lluís Batlle i Rossell 336d33e591 Adding the wifi nic rt73 firmware into the nixos cds. 
I'm not sure if I had to add the module file reference in "required", or all
modules are properly loaded.


svn path=/nixos/trunk/; revision=17800
 2009-10-14 13:10:41 +00:00
Eelco Dolstra 679c3f9295 * Fix the xfsprogs/jfsutils attribute names. TODO: these shouldn't be 
listed in three different places.  The set of "rescue" packages
  should be factored out into a separate module.

svn path=/nixos/trunk/; revision=17727
 2009-10-08 13:10:08 +00:00
Michael Raskin 478dd67532 Fixing incorrect file reference 
svn path=/nixos/trunk/; revision=17311
 2009-09-20 18:48:34 +00:00
Michael Raskin 69cc6ce3ec Refactoring modules and cleaning up a comment 
svn path=/nixos/trunk/; revision=17310
 2009-09-20 18:15:52 +00:00
Michael Raskin de555c3705 Reduce size of iso-minimal-fresh-kernel and make it easier to install offline 
svn path=/nixos/trunk/; revision=17301
 2009-09-20 15:07:19 +00:00
Michael Raskin 9be240eaf2 Add rescue functionality 
svn path=/nixos/trunk/; revision=17296
 2009-09-20 09:50:24 +00:00
Michael Raskin 406bcd0d4f Adding the single package needed for the offline installation 
svn path=/nixos/trunk/; revision=17291
 2009-09-20 06:00:50 +00:00
Michael Raskin a574ae095a Fresh kernel means fresh kernel! 
svn path=/nixos/trunk/; revision=17272
 2009-09-19 11:09:22 +00:00
Michael Raskin 3202022355 Adding an updated iso_minimal version 
svn path=/nixos/trunk/; revision=17186
 2009-09-16 12:31:23 +00:00
Eelco Dolstra a9eadf9fe6 * Add vfat to the initrd on the CD to enable people to copy the 
contents of the CD to a bootable USB stick.

svn path=/nixos/trunk/; revision=17109
 2009-09-14 13:19:28 +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 a7001d34d7 * Oops, didn't want to commit that. 
svn path=/nixos/trunk/; revision=16898
 2009-08-31 13:46:56 +00:00
Eelco Dolstra 921b838149 * test -> tests. 
svn path=/nixos/trunk/; revision=16897
 2009-08-31 13:40:57 +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 bef1dc8bd5 Update RC kernel for rescue CD: includes some BtrFS fixes 
svn path=/nixos/branches/modular-nixos/; revision=16515
 2009-07-30 04:20:56 +00:00
Michael Raskin 8f7b33c87d I thought squashfs would not require loop.ko 
svn path=/nixos/branches/modular-nixos/; revision=16388
 2009-07-16 10:28:58 +00:00
Michael Raskin fac9d09941 Oops, forgot FS modules 
svn path=/nixos/branches/modular-nixos/; revision=16387
 2009-07-16 10:06:53 +00:00
Michael Raskin e155a46516 Forgot all-module fixes for the correct booting in rescue CD 
svn path=/nixos/branches/modular-nixos/; revision=16386
 2009-07-16 09:48:22 +00:00
Michael Raskin a7f24fd4bb Trying to build a good rescue CD.. 
svn path=/nixos/branches/modular-nixos/; revision=16385
 2009-07-16 09:22:40 +00:00
Eelco Dolstra da996583ee * Include the NixOS manpages in the system environment. Actually 
there is only one currently: configuration.nix(5), which contains a
  list of all the options.

svn path=/nixos/branches/modular-nixos/; revision=16360
 2009-07-14 16:27:46 +00:00
Eelco Dolstra 1803c67d13 * Leave out HAL and d-bus (not needed). 
svn path=/nixos/branches/modular-nixos/; revision=16032
 2009-06-24 09:11:26 +00:00
Eelco Dolstra 74995fe553 * The CD volume label was just over the limit of 32 characters. 
svn path=/nixos/branches/modular-nixos/; revision=16027
 2009-06-22 16:38:11 +00:00
Eelco Dolstra 97a4e1fcb3 * Rename the CD modules to something more sensible. 
* Make sure that reconfiguration in the live CD works properly by
  including the proper configuration module in
  /etc/nixos/configuration.nix.  Ugly.

svn path=/nixos/branches/modular-nixos/; revision=16016
 2009-06-22 10:03:58 +00:00
Eelco Dolstra 03760c0c03 * `installation-cd-big.nix' builds a NixOS installation CD containing 
an X server and KDE 4.  Thanks to squashfs it's only 466 MiB large.
  `installation-cd-small.nix' builds the original, text-only
  installation CD.

svn path=/nixos/branches/modular-nixos/; revision=15934
 2009-06-11 09:51:27 +00:00
Eelco Dolstra cd1e4aefc1 * Break the cyclic dependency between the system derivation and 
Grub's menu.lst.

svn path=/nixos/branches/modular-nixos/; revision=15931
 2009-06-10 21:46:42 +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 135240e05f * Sigh. The nix-env call has to come after nix-store --load-db. 
Should really allow an ordering between postBootCommands.

svn path=/nixos/branches/modular-nixos/; revision=15923
 2009-06-10 12:51:16 +00:00
Eelco Dolstra 463cf8efdd * Provide a /etc/nixos/configuration.nix in the booted CD to make 
nixos-rebuild work.  This makes it a true live CD.

svn path=/nixos/branches/modular-nixos/; revision=15922
 2009-06-10 12:34:58 +00:00
Eelco Dolstra 1f8602afd2 * Get rid of the old CD/DVD expressions. live-dvd.nix is basically 
rescue-dvd.nix (not tested though), i.e. it has all its extra
  packages and includes the build-time dependencies.

svn path=/nixos/branches/modular-nixos/; revision=15917
 2009-06-10 11:00:29 +00:00
Eelco Dolstra ba43b5d000 * Set the CD volume ID and the ISO filename. 
svn path=/nixos/branches/modular-nixos/; revision=15912
 2009-06-09 15:23:03 +00:00
Eelco Dolstra 803d8b646f * Option isoImage.storeContents to add extra paths to the Nix store on 
the CD.

svn path=/nixos/branches/modular-nixos/; revision=15906
 2009-06-09 13:27:50 +00:00
Eelco Dolstra 45e6fe420c svn path=/nixos/branches/modular-nixos/; revision=15905 2009-06-09 13:14:43 +00:00
Eelco Dolstra 6023722135 * Provide Memtest86 as a module. 
svn path=/nixos/branches/modular-nixos/; revision=15904
 2009-06-09 12:02:52 +00:00
Eelco Dolstra 37edcf4fae * Provide an option to add more files to the ISO image. 
svn path=/nixos/branches/modular-nixos/; revision=15903
 2009-06-09 12:01:31 +00:00
Eelco Dolstra ca061eb628 * Include the NixOS/Nixpkgs trees on the CD. 
svn path=/nixos/branches/modular-nixos/; revision=15897
 2009-06-08 22:45:45 +00:00
Eelco Dolstra eb8b534173 * Include only the en_US locale on the CD. This saves 75 MiB or so. 
svn path=/nixos/branches/modular-nixos/; revision=15883
 2009-06-05 17:19:30 +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 5cf8604b1e * Module that contains the configuration for the NixOS installation CD 
(not yet complete).

svn path=/nixos/branches/modular-nixos/; revision=15878
 2009-06-05 15:10:15 +00:00
Eelco Dolstra e4e408293e * Modularise the building of the installation CD/DVD. The module 
iso-image.nix contains the minimal stuff necessary to build a
  bootable ISO image containing the given configuration.  The idea is
  that this can be customised by providing additional modules, e.g. to
  add extra packages to the image.

  The ISO image is exported in the configuration attribute
  system.build.isoImage.  So it can be built as follows:

  $ nix-build lib/eval-config.nix \
      --arg configuration 'import ./modules/installer/cd-dvd/iso-image.nix' \
      -A config.system.build.isoImage


svn path=/nixos/branches/modular-nixos/; revision=15871
 2009-06-05 13:35:27 +00:00