summaryrefslogtreecommitdiffstats
path: root/perl-install
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 /perl-install
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 'perl-install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm13
-rw-r--r--perl-install/install/share/symlinks6
3 files changed, 4 insertions, 17 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b56604de1..08acc5fa8 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- adapt to a dracut based stage1
+
Version 15.68.1 - 14 October 2013
- adapt to latest mdadm
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 02888ff2c..f6e30e8d8 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -295,15 +295,6 @@ sub exitInstall {
sub start_udev() {
return if fuzzy_pidofs('udevd');
- # Ensure /run is mounted
- mkdir("/run", 0755);
- run_program::run("mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run");
-
- # Fake dracut boot (due to checks employed when running dracut during install)
- # as we know that we'll have the needed metadata in udevadm db due to us
- # starting udev nice and early here.
- mkdir_p("/run/initramfs");
-
# Start up udev:
mkdir_p("/run/udev/rules.d");
$ENV{UDEVRULESD} = "/run/udev/rules.d";
@@ -316,7 +307,7 @@ sub start_udev() {
sub stop_udev() {
kill 15, fuzzy_pidofs('udevd');
sleep(2);
- fs::mount::umount($_) foreach '/dev/pts', '/dev/shm', '/run';
+ fs::mount::umount($_) foreach '/dev/pts', '/dev/shm';
}
#-######################################################################################
@@ -618,7 +609,7 @@ sub main {
}
$o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : "/mnt";
- mkdir $::prefix, 0755;
+ mkdir $::prefix, 0755 if ! -d $::prefix;
init_path();
diff --git a/perl-install/install/share/symlinks b/perl-install/install/share/symlinks
index 8c2432248..eb0de9b47 100644
--- a/perl-install/install/share/symlinks
+++ b/perl-install/install/share/symlinks
@@ -1,5 +1,3 @@
-/sbin
-/bin
/etc/mke2fs.conf
/etc/protocols
/etc/services
@@ -7,7 +5,3 @@
/etc/passwd
/etc/pki
/etc/urpmi
-/lib
-/lib64
-/usr
-/tmp /var/run