Comment 4 for bug 1007677

This was a complete train wreak. I added the 'folder' checks in to avoid booting with an empty /usr. Thus I believe that overlayfs grabs the folder as-is and doesn't detect future mounted filesystems, always using the device and inode detected at mount time... That's an(two in this case) empty folder.

Doing the mount this way prevents the system from booting into an unrecoverable state. Booting into rescue/single-user mode I was able to correct the system.

I believe this is an issue with the boot scripts, as "mount -a" always seams to do the correct thing.