don't try to mount /usr if it's not on separate fs

diff --git a/geninitrd b/geninitrd
index 2cb8d34fc6fefa96c5b55d1c28581fc675fe344e..0a422ee4c9820f1517773ed0d09d71f1de6f3eaa 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -1085,8 +1085,10 @@ initrd_gen_initramfs_switchroot() {
                # probably break (sometimes even silently) in mysterious ways. Consult
                # http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken
                # for more information.
-               echo trying to mount /usr
-               chroot /newroot mount -n /usr
+               if chroot /newroot findmnt -s -n /usr > /dev/null 2> /dev/null; then
+                       echo trying to mount /usr
+                       chroot /newroot mount -n /usr
+               fi
 
                exec switch_root /newroot $init ${1:+"$@"}