From 11c603c3fba2f1916ad6a8f7c9b8c24e7365ee3e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Aug 2009 16:48:28 +0000
Subject: [PATCH] * Fix booting from CD.  60-persistent-storage.rules requires
 some   variables set by 60-cdrom_id.rules.

svn path=/nixos/trunk/; revision=16773
---
 modules/system/boot/stage-1.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 3715fd4e0b4..95b5372a515 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -228,14 +228,22 @@ let
     name = "udev-rules";
     buildCommand = ''
       ensureDir $out
+      
+      cp ${pkgs.udev}/libexec/rules.d/60-cdrom_id.rules $out/
       cp ${pkgs.udev}/libexec/rules.d/60-persistent-storage.rules $out/
-      substituteInPlace $out/60-persistent-storage.rules \
-        --replace ata_id ${extraUtils}/bin/ata_id \
-        --replace usb_id ${extraUtils}/bin/usb_id \
-        --replace scsi_id ${extraUtils}/bin/scsi_id \
-        --replace path_id ${extraUtils}/bin/path_id \
-        --replace vol_id ${extraUtils}/bin/vol_id \
-        --replace /sbin/blkid ${extraUtils}/bin/blkid
+
+      for i in $out/*.rules; do
+          substituteInPlace $i \
+            --replace ata_id ${extraUtils}/bin/ata_id \
+            --replace usb_id ${extraUtils}/bin/usb_id \
+            --replace scsi_id ${extraUtils}/bin/scsi_id \
+            --replace path_id ${extraUtils}/bin/path_id \
+            --replace vol_id ${extraUtils}/bin/vol_id \
+            --replace cdrom_id ${extraUtils}/bin/cdrom_id \
+            --replace /sbin/blkid ${extraUtils}/bin/blkid
+      done
+
+      # !!! What does this do?
       sed -e '/^ENV[{]DEVTYPE[}]=="disk", .*GOTO/d' -i $out/60-persistent-storage.rules 
     ''; # */
   };