diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-03-18 15:02:09 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-03-18 15:02:09 +0100 |
| commit | f73ff0529ef079cb9b53b25201766d670287b28f (patch) | |
| tree | ab58068db2df3cdc9a715454b33668602b16e005 /pkgs | |
| parent | b6d3526c53c0ad2ff5f80bde6815a74119617dec (diff) | |
| download | nixlib-f73ff0529ef079cb9b53b25201766d670287b28f.tar nixlib-f73ff0529ef079cb9b53b25201766d670287b28f.tar.gz nixlib-f73ff0529ef079cb9b53b25201766d670287b28f.tar.bz2 nixlib-f73ff0529ef079cb9b53b25201766d670287b28f.tar.lz nixlib-f73ff0529ef079cb9b53b25201766d670287b28f.tar.xz nixlib-f73ff0529ef079cb9b53b25201766d670287b28f.tar.zst nixlib-f73ff0529ef079cb9b53b25201766d670287b28f.zip | |
runInLinuxVM: Set the clock properly
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 3dcb8aa17055..274cd05024bd 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -2,7 +2,7 @@ , kernel ? pkgs.linux_3_10 , img ? "bzImage" , rootModules ? - [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ] + [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ] }: with pkgs; @@ -57,6 +57,7 @@ rec { mknod ${dev}/random c 1 8 mknod ${dev}/urandom c 1 9 mknod ${dev}/tty c 5 0 + mknod ${dev}/rtc c 254 0 . /sys/class/block/${hd}/uevent mknod ${dev}/${hd} b $MAJOR $MINOR ''; @@ -159,6 +160,10 @@ rec { #! ${bash}/bin/sh source /tmp/xchg/saved-env + # Set the system time from the hardware clock. Works around an + # apparent KVM > 1.5.2 bug. + ${pkgs.utillinux}/sbin/hwclock -s + export NIX_STORE=/nix/store export NIX_BUILD_TOP=/tmp export TMPDIR=/tmp |