Repare rootfs generation

Previous commit generates a wrong rootfs. This commit reverts it and
also corrects the problem the previous commit corrected.

Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>