diff options
Diffstat (limited to 'perl-install/install/install2.pm')
| -rw-r--r-- | perl-install/install/install2.pm | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index 02888ff2c..661f3d4a8 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'; } #-###################################################################################### @@ -424,7 +415,7 @@ sub read_stage1_net_conf() { #- get stage1 network configuration if any. log::l('found /tmp/network'); add2hash($o->{net}{network} ||= {}, network::network::read_conf('/tmp/network')); - if (my ($file) = glob_('/tmp/ifcfg-*')) { + if (my ($file) = grep { -f $_ } glob_('/tmp/ifcfg-*')) { log::l("found network config file $file"); my $l = network::network::read_interface_conf($file); $o->{net}{ifcfg}{$l->{DEVICE}} ||= $l; @@ -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(); |