mergemaster.sh - Fix check for devfs

* mergemaster.sh was checking for sysctl node vfs.devfs.generation,
  which does not exist on DragonFly. Change this check to vfs.devfs.

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 7491d38..e9cb48e 100644 (file)
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -558,7 +558,7 @@ case "${RERUN}" in
   esac
 
   # Avoid trying to update MAKEDEV if /dev is on a devfs
-  if /sbin/sysctl vfs.devfs.generation > /dev/null 2>&1 ; then
+  if /sbin/sysctl vfs.devfs > /dev/null 2>&1 ; then
     rm -f ${TEMPROOT}/dev/MAKEDEV ${TEMPROOT}/dev/MAKEDEV.local
   fi