* udevtrigger / udevsettle -> udevadm.

svn path=/nixos/trunk/; revision=12229

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

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/*
     ''; # */
   

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"