merge initrd changes from trunk