Project

General

Profile

« Previous | Next » 

Revision 84963037

Added by Jim Pingle over 6 years ago

Solve a package reinstall/start race condition. Fixes #9045

View differences:

src/etc/rc.package_reinstall_all
26 26
$max_tries = 5;
27 27

  
28 28
mark_subsystem_dirty('packagelock');
29
unlink_if_exists("{$g['conf_path']}/needs_package_sync");
30 29

  
31 30
/* If it's still booting, give it a few seconds before start */
32 31
if (platform_booting()) {
......
41 40
	$ntries++;
42 41
}
43 42

  
43
unlink_if_exists("{$g['conf_path']}/needs_package_sync");
44

  
44 45
if ($ntries > $max_tries) {
45 46
	file_notice(gettext("Package reinstall"), gettext("Package reinstall " .
46 47
	    "process was ABORTED due to lack of internet connectivity"));
47 48
} else {
48 49
	file_notice(gettext("Package reinstall"), gettext("Package reinstall " .
49 50
	    "process finished successfully"));
51
	mwexec_bg("{$g['etc_path']}/rc.start_packages");
50 52
}
51 53

  
52 54
/* Detect installed binary pkgs that are not registered in the system */

Also available in: Unified diff