stage1: Move the symlink creation from stage1 to init.

In order to run stage1 we now need to do things a little differently,
namely that we move the symlinking fixups into 'init' itself which we will
actually call as a kind of fake switch_root implementation to avoid
hacking dracut too much[1]. As we run stage1 during dracut's 'mount' phase
we should not do the symlink hacks so early otherwise it will mess up
the rest of the dracut initqueue processing.

Currently, the initrd's /usr is nuked and then symlinked, but to
allow for easier debugging I now just bind mount the stage2 /usr over
the top which allows us to unmount it again easily enough if we want to
go back.

We no longer touch the /bin, /sbin or /lib[64] symlinks as these are
relative and simply bind mounting /usr is enough to fix all of them.

1. This scheme will have to change if we eventually swtich to a
systemd based dracut invocation.

1 files changed, 0 insertions, 2 deletions

diff --git a/mdk-stage1/tools.h b/mdk-stage1/tools.h
index 1b08e42ca..87c0c1d49 100644
--- a/mdk-stage1/tools.h
+++ b/mdk-stage1/tools.h
@@ -29,8 +29,6 @@ int image_has_stage2();
 enum return_type create_IMAGE_LOCATION(char *location_full);
 int ramdisk_possible(void);
 enum return_type copy_file(char * from, char * to, void (*callback_func)(int overall));
-enum return_type recursiveRemove(char *file);
-enum return_type recursiveRemove_if_it_exists(char *file);
 enum return_type preload_mount_compressed_fd(int compressed_fd, int image_size, char *image_name, char *location_mount);
 enum return_type mount_compressed_image(char *compressed_image,  char *location_mount);
 enum return_type mount_compressed_image_may_preload(char *image_name, char *location_mount, int preload);