From 25dbf1594eee02358825bdeb3ce0d291cb92ca06 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 21:12:37 +0000
Subject: [PATCH] * Updates for the new udev and util-linux-ng: fsck is now in 
  util-linux-ng instead of e2fsprogs, blkid is in util-linux-ng, and   we need
 to manually create /dev/.udev prior to starting udevd for   some reason.

svn path=/nixos/trunk/; revision=16691
---
 modules/system/boot/stage-1-init.sh |  3 ++-
 modules/system/boot/stage-1.nix     | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 8604df5a70d..121605ab479 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -112,6 +112,7 @@ echo shutdown > /sys/power/disk
 
 # Create device nodes in /dev.
 export UDEV_CONFIG_FILE=@udevConf@
+mkdir -p /dev/.udev # !!! bug in udev?
 udevd --daemon
 udevadm trigger
 udevadm settle
@@ -282,7 +283,7 @@ fi
 
 
 # Stop udevd.
-kill $(minips -C udevd -o pid=)
+kill $(minips -C udevd -o pid=) 2> /dev/null
 
 
 if test -n "$debug1mounts"; then fail; fi
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index fd515b4bacc..3715fd4e0b4 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -141,7 +141,11 @@ let
       cp -p ${pkgs.glibc}/lib/libdl.so.* $out/lib
 
       # Copy some utillinux stuff.
-      cp ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount ${pkgs.utillinux}/sbin/pivot_root $out/bin
+      cp ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount \
+         ${pkgs.utillinux}/sbin/fsck ${pkgs.utillinux}/sbin/pivot_root \
+         ${pkgs.utillinux}/sbin/blkid $out/bin
+      cp -pd ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib
+      cp -pd ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib
 
       # Copy some coreutils.
       cp ${pkgs.coreutils}/bin/basename $out/bin
@@ -149,7 +153,6 @@ let
       # Copy e2fsck and friends.      
       cp ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
       cp ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin
-      cp ${pkgs.e2fsprogs}/sbin/fsck $out/bin
       cp ${pkgs.reiserfsprogs}/sbin/reiserfsck $out/bin
       ln -s e2fsck $out/bin/fsck.ext2
       ln -s e2fsck $out/bin/fsck.ext3
@@ -170,8 +173,7 @@ let
 
       # Copy udev.
       cp ${pkgs.udev}/sbin/udevd ${pkgs.udev}/sbin/udevadm $out/bin
-      cp ${pkgs.udev}/lib/udev/*_id $out/bin
-      cp ${pkgs.udev}/lib/libvolume_id.so.* $out/lib
+      cp ${pkgs.udev}/libexec/*_id $out/bin
       
       # Copy bash.
       cp ${pkgs.bash}/bin/bash $out/bin
@@ -202,7 +204,7 @@ let
       $out/bin/tune2fs 2> /dev/null | grep "tune2fs "
       $out/bin/fsck -N
       $out/bin/udevadm --version
-      $out/bin/vol_id 2>&1 | grep "no device"
+      $out/bin/blkid -v 2>&1 | grep "blkid from util-linux-ng"
       if test -n "$devicemapper"; then
           $out/bin/dmsetup --version | grep "version:"
           LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | grep "LVM"
@@ -226,13 +228,14 @@ let
     name = "udev-rules";
     buildCommand = ''
       ensureDir $out
-      cp ${pkgs.udev}/*/udev/rules.d/60-persistent-storage.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 vol_id ${extraUtils}/bin/vol_id \
+        --replace /sbin/blkid ${extraUtils}/bin/blkid
       sed -e '/^ENV[{]DEVTYPE[}]=="disk", .*GOTO/d' -i $out/60-persistent-storage.rules 
     ''; # */
   };