diff options
| author | Arnaud Patard <rtp@mageia.org> | 2012-04-30 07:54:17 +0000 |
|---|---|---|
| committer | Arnaud Patard <rtp@mageia.org> | 2012-04-30 07:54:17 +0000 |
| commit | 411b42978a7cbbf70d47d474460ec86f5e300015 (patch) | |
| tree | 1479de1c05abbcb09bde5a14e61e77ace34b27c5 | |
| parent | 83b8f305f8fe1d4ed0c15c50b0d7ead8aab0e218 (diff) | |
| download | drakx-411b42978a7cbbf70d47d474460ec86f5e300015.tar drakx-411b42978a7cbbf70d47d474460ec86f5e300015.tar.gz drakx-411b42978a7cbbf70d47d474460ec86f5e300015.tar.bz2 drakx-411b42978a7cbbf70d47d474460ec86f5e300015.tar.xz drakx-411b42978a7cbbf70d47d474460ec86f5e300015.zip | |
- fix rebooting on autoinstall
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/install/install2.pm | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 0c3dcf0f6..6eb18394c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- fix rebooting on autoinstall by using a "wider" regexp (otherwise udevd was + not found by fuzzy_pidofs) and gives some time to udevd process to disappear. + Also, don't try to unmount /dev as it's still used by other processes. - pkgs.pm, http.pm: Allow to set urpm curl options in order to be able to make curl quiet when running an autoinstall in text mode. This can be set throught the new option "curl_options" in the auto_inst file. diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index 44d9bf916..99a122e03 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -311,9 +311,10 @@ sub start_udev() { } sub stop_udev() { - kill 15, fuzzy_pidofs('^udevd\b'); + kill 15, fuzzy_pidofs('udevd'); + sleep(2); require fs::mount; - fs::mount::umount($_) foreach '/dev/pts', '/dev/shm', '/run', '/dev'; + fs::mount::umount($_) foreach '/dev/pts', '/dev/shm', '/run'; } #-###################################################################################### |