Attachment 290556 Details for Bug 167213 – Implementation for Fedora 8

[patch] Implementation for Fedora 8

mkinitrd-6.0.19-rootdir.patch (text/plain), 1.88 KB, created by Kasper Dupont on 2007-12-30 20:06:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kasper Dupont

Created: 2007-12-30 20:06:18 UTC

Size: 1.88 KB

patch

obsolete

>diff -up mkinitrd-6.0.19/nash/nash.c.orig mkinitrd-6.0.19/nash/nash.c
>--- mkinitrd-6.0.19/nash/nash.c.orig	2007-09-27 13:26:43.000000000 -0400
>+++ mkinitrd-6.0.19/nash/nash.c	2007-12-30 04:02:33.000000000 -0500
>@@ -1054,7 +1054,7 @@ static int
> setuprootCommand(char *cmd, char *end)
> {
>     FILE *fp;
>-    char *new;
>+    char *new, *new2, *rootdir;
> 
>     qprintf("Setting up new root fs\n");
> 
>@@ -1070,6 +1070,29 @@ setuprootCommand(char *cmd, char *end)
>         return 1;
>     }
> 
>+    /* Use an alternate root if one is specified in the environment */
>+    rootdir=getenv("ROOTDIR");
>+    if (rootdir&&rootdir[0]) {
>+        new2 = "/sysroot2";
>+        if (mount(rootdir, new2, NULL, MS_BIND, NULL) < 0) {
>+            eprintf("setuproot: binding %s to %s failed: %m\n", rootdir, new2);
>+        } else {
>+            if (chdir(new2)) {
>+                eprintf("setuproot: chdir(%s) failed: %m\n", new2);
>+                return 1;
>+            }
>+            if (umount2(new, MNT_DETACH) < 0) {
>+                eprintf("ERROR unmounting old %s: %m\n",new);
>+                eprintf("forcing unmount of %s\n", new);
>+                umount2(new, MNT_FORCE);
>+            }
>+            if (mount(new2, new, NULL, MS_MOVE, NULL) < 0) {
>+                eprintf("setuproot: moving %s to %s failed: %m\n", new2, new);
>+                return 1;
>+            }
>+        }
>+    }
>+
>     if (mount("/dev", "./dev", NULL, MS_BIND, NULL) < 0)
>         eprintf("setuproot: moving /dev failed: %m\n");
> 
>diff -up mkinitrd-6.0.19/mkinitrd.orig mkinitrd-6.0.19/mkinitrd
>--- mkinitrd-6.0.19/mkinitrd.orig	2007-09-27 13:26:43.000000000 -0400
>+++ mkinitrd-6.0.19/mkinitrd	2007-12-30 04:02:33.000000000 -0500
>@@ -1299,6 +1299,7 @@ mkdir -p $MNTIMAGE/dev
> mkdir -p $MNTIMAGE/proc
> mkdir -p $MNTIMAGE/sys
> mkdir -p $MNTIMAGE/sysroot
>+mkdir -p $MNTIMAGE/sysroot2
> ln -s bin $MNTIMAGE/sbin
> 
> vecho "Building initrd in $MNTIMAGE"

Actions: View | Diff

Attachments on bug 167213: 118310 | 134523 | 146210 | 290556 | 328533