diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 4aae3a7819..494664627d 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -297,9 +297,9 @@ fakeroot do_rootfs () {
 	# copy the intercept scripts
 	cp ${COREBASE}/scripts/postinst-intercepts/* ${WORKDIR}/intercept_scripts/
 
-	# If "${IMAGE_ROOTFS}/dev" exists, then the device had been made by
-	# the previous build
-	if [ "${USE_DEVFS}" != "1" -a ! -r "${IMAGE_ROOTFS}/dev" ]; then
+	rootfs_${IMAGE_PKGTYPE}_do_rootfs
+
+	if [ "${USE_DEVFS}" != "1" ]; then
 		for devtable in ${@get_devtable_list(d)}; do
 			# Always return ture since there maybe already one when use the
 			# incremental image generation
@@ -307,8 +307,6 @@ fakeroot do_rootfs () {
 		done
 	fi
 
-	rootfs_${IMAGE_PKGTYPE}_do_rootfs
-
 	# remove unneeded packages/files from the final image
 	rootfs_remove_unneeded