summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-10-19 19:58:09 +0100
committerColin Guthrie <colin@mageia.org>2013-10-29 20:29:08 +0000
commit49b778dec05a142690bf88ead5649fefe0adc1a6 (patch)
tree17d3a0b22936a5576b82de20ce78a187ba4491af /tools
parentc4321813f9f3cd4136203d52c0f20343d7722228 (diff)
downloaddrakx-49b778dec05a142690bf88ead5649fefe0adc1a6.tar
drakx-49b778dec05a142690bf88ead5649fefe0adc1a6.tar.gz
drakx-49b778dec05a142690bf88ead5649fefe0adc1a6.tar.bz2
drakx-49b778dec05a142690bf88ead5649fefe0adc1a6.tar.xz
drakx-49b778dec05a142690bf88ead5649fefe0adc1a6.zip
install/rescue: Adapt to a dracut based stage1.
The main change here is not remounting a fresh /run. Dracut does this for us and we actually need to keep this one as the initial udev database (when udev is started by dracut) is stored here and thus mounting an empty fs could see us lose some metadata. We no longer touch the /bin, /sbin or /lib[64] symlinks as these are already relative symlinks into /usr and simply bind mounting /usr is enough.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/drakx-in-chroot8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot
index 1384c2e18..852792349 100755
--- a/tools/drakx-in-chroot
+++ b/tools/drakx-in-chroot
@@ -184,6 +184,14 @@ sub create_initial_symlinks() {
symlink $from, $to or die "symlinking $to failed\n";
}
}
+ $from = "$STAGE2_LOCATION_ROOTED/usr";
+ $to = "$SLASH_LOCATION/usr";
+ symlink $from, $to or die "symlinking $to failed\n";
+ foreach ('bin', 'sbin', 'lib', 'lib64') {
+ $from = "usr/$_";
+ $to = "$SLASH_LOCATION/$_";
+ symlink $from, $to or die "symlinking $to failed\n";
+ }
}
sub create_initial_devices() {