Project

General

Profile

« Previous | Next » 

Revision c468ffb5

Added by Jim Pingle over 11 years ago

Add a file flag to trigger the forced serial or else we may miss it during a firmware update and still end up with an accidentally disabled port.

View differences:

tmp/post_upgrade_command.php
13 13
			system("pfSsh.php playback gitsync " . escapeshellarg($config['system']['gitsync']['branch']) . " --upgrading");
14 14
	}
15 15

  
16
	if($g['platform'] == "embedded" || $g['enableserial_force']) {
16
	$newslicedir = "";
17
	if ($argv[1] != "")
18
		$newslicedir = '/tmp/' . $argv[1];
19

  
20
	if($g['platform'] == "embedded" || $g['enableserial_force'] || file_exists("{$newslicedir}/enableserial_force")) {
17 21
		$config['system']['enableserial'] = true;
18 22
		write_config();
19 23
	}
20 24

  
21
	$newslicedir = "";
22
	if ($argv[1] != "")
23
		$newslicedir = '/tmp/' . $argv[1];
24 25
	system("echo \"Adding serial port settings ({$newslicedir})...\" >> /conf/upgrade_log.txt");
25 26
	setup_serial_port("upgrade", $newslicedir);
26 27
		

Also available in: Unified diff