diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-16 16:48:34 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-16 16:48:34 +0000 |
| commit | 63bd2744b74ef68f3e960026e133585f12c0cbcc (patch) | |
| tree | 48786204b6b801d78ea69f074ad9fbc729e53b77 /modules/system/boot/stage-1.nix | |
| parent | 5427b0f83771e54ee9fac1833b7c8d14112bcc2e (diff) | |
| download | nixpkgs-63bd2744b74ef68f3e960026e133585f12c0cbcc.tar nixpkgs-63bd2744b74ef68f3e960026e133585f12c0cbcc.tar.gz nixpkgs-63bd2744b74ef68f3e960026e133585f12c0cbcc.tar.bz2 nixpkgs-63bd2744b74ef68f3e960026e133585f12c0cbcc.tar.lz nixpkgs-63bd2744b74ef68f3e960026e133585f12c0cbcc.tar.xz nixpkgs-63bd2744b74ef68f3e960026e133585f12c0cbcc.tar.zst nixpkgs-63bd2744b74ef68f3e960026e133585f12c0cbcc.zip | |
* Partially revert r25991 because it depends on the x-updates branch.
svn path=/nixos/trunk/; revision=25995
Diffstat (limited to 'modules/system/boot/stage-1.nix')
| -rw-r--r-- | modules/system/boot/stage-1.nix | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix index b2769f63ac9..cdfbdbbf432 100644 --- a/modules/system/boot/stage-1.nix +++ b/modules/system/boot/stage-1.nix @@ -245,6 +245,21 @@ let --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"' \ --replace /sbin/mdadm ${extraUtils}/bin/mdadm done + + # !!! Remove this after merging the x-updates branch: + + # Work around a bug in QEMU, which doesn't implement the "READ + # DISC INFORMATION" SCSI command: + # https://bugzilla.redhat.com/show_bug.cgi?id=609049 + # As a result, `cdrom_id' doesn't print + # ID_CDROM_MEDIA_TRACK_COUNT_DATA, which in turn prevents the + # /dev/disk/by-label symlinks from being created. We need these + # in the NixOS installation CD, so use ID_CDROM_MEDIA in the + # corresponding udev rules for now. This was the behaviour in + # udev <= 154. See also + # http://www.spinics.net/lists/hotplug/msg03935.html + substituteInPlace $out/60-persistent-storage.rules \ + --replace ID_CDROM_MEDIA_TRACK_COUNT_DATA ID_CDROM_MEDIA ''; # */ }; |