Author: eelco
Date: Wed Feb 16 16:48:34 2011
New Revision: 25995
URL: https://svn.nixos.org/websvn/nix/?rev=25995&sc=1
Log:
* Partially revert r25991 because it depends on the x-updates branch.
Modified:
nixos/trunk/modules/system/boot/stage-1.nix
Modified: nixos/trunk/modules/system/boot/stage-1.nix
==============================================================================
--- nixos/trunk/modules/system/boot/stage-1.nix Wed Feb 16 15:33:54 2011
(r25994)
+++ nixos/trunk/modules/system/boot/stage-1.nix Wed Feb 16 16:48:34 2011
(r25995)
@@ -245,6 +245,21 @@
--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
''; # */
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
