summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/utils.c
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-10-19 21:30:12 +0100
committerColin Guthrie <colin@mageia.org>2013-10-29 20:29:07 +0000
commitc4321813f9f3cd4136203d52c0f20343d7722228 (patch)
treeba1cbb296d3d490142d670f88a2a76452a87829d /mdk-stage1/utils.c
parent7213bee2f13e551bffb7754846726833e196719b (diff)
downloaddrakx-c4321813f9f3cd4136203d52c0f20343d7722228.tar
drakx-c4321813f9f3cd4136203d52c0f20343d7722228.tar.gz
drakx-c4321813f9f3cd4136203d52c0f20343d7722228.tar.bz2
drakx-c4321813f9f3cd4136203d52c0f20343d7722228.tar.xz
drakx-c4321813f9f3cd4136203d52c0f20343d7722228.zip
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.
Diffstat (limited to 'mdk-stage1/utils.c')
-rw-r--r--mdk-stage1/utils.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/mdk-stage1/utils.c b/mdk-stage1/utils.c
index af5ee9af3..d861877e4 100644
--- a/mdk-stage1/utils.c
+++ b/mdk-stage1/utils.c
@@ -162,14 +162,6 @@ char * asprintf_(const char *msg, ...)
return strdup("");
}
-int scall_(int retval, char * msg, char * file, int line)
-{
- char tmp[5000];
- sprintf(tmp, "%s(%s:%d) failed", msg, file, line);
- if (retval)
- log_perror(tmp);
- return retval;
-}
void lowercase(char *s)
{