From eaf6b8eb18b3b29f424e000c22bf6cc6dc6d00d4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jul 2008 08:28:56 +0000
Subject: [PATCH] * udevtrigger / udevsettle -> udevadm.

svn path=/nixos/trunk/; revision=12229
---
 boot/boot-stage-1-init.sh | 6 +++---
 system/system.nix         | 2 +-
 upstart-jobs/udev.nix     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 8ed3887cc351..95ae1e34d7a0 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -83,8 +83,8 @@ mknod -m 0666 /dev/null c 1 3
 export UDEV_CONFIG_FILE=/udev.conf
 echo 'udev_rules="/no-rules"' > $UDEV_CONFIG_FILE
 udevd --daemon
-udevtrigger
-udevsettle
+udevadm trigger
+udevadm settle
 
 if type -p dmsetup > /dev/null; then
   echo "dmsetup found, starting device mapper and lvm"
@@ -116,7 +116,7 @@ mountFS() {
     fi
 
     if test -n "$mustCheck"; then
-        FSTAB_FILE="/etc/mtab" fsck -C -a "$device"
+        FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
         fsckResult=$?
 
         if test $(($fsckResult | 2)) = $fsckResult; then
diff --git a/system/system.nix b/system/system.nix
index a2001ebf390c..74bbf5d2b0e1 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -86,7 +86,7 @@ rec {
       fi
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
       cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
-      cp $udev/sbin/udevd $udev/sbin/udevtrigger $udev/sbin/udevsettle $out/bin
+      cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
       nuke-refs $out/bin/*
     ''; # */
   
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 13ac6fd3a136..c4dce484fd59 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -70,13 +70,13 @@ in
 	# been loaded into the kernel (or for which support is built into
 	# the kernel).
 	if ! test -e ${devicesCreated}; then
-	    ${udev}/sbin/udevtrigger
-	    ${udev}/sbin/udevsettle # wait for udev to finish
+	    ${udev}/sbin/udevadm trigger
+	    ${udev}/sbin/udevadm settle # wait for udev to finish
 	    touch ${devicesCreated}
 	fi
 
 	# Kill udev, let Upstart restart and monitor it.  (This is nasty,
-	# but we have to run udevtrigger first.  Maybe we can use
+	# but we have to run `udevadm trigger' first.  Maybe we can use
 	# Upstart's `binary' keyword, but it isn't implemented yet.)
 	if ! ${procps}/bin/pkill -u root "^udevd$"; then
 	    echo "couldn't stop udevd"