Merge branch 'nobootwait' into 'stable-3.1'

Till Brehm · Till Brehm · commit 09d8e8abe43c · 2020-07-10T12:26:28.000+02:00
Replace deprecated nobootwait with nofail

See merge request ispconfig/ispconfig3!1034
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -778,7 +778,7 @@ function update($event_name, $data) {
 			$app->system->chmod($data['new']['document_root'].'/'.$log_folder, 0755);
 			$app->system->exec_safe('mount --bind ? ?', '/var/log/ispconfig/httpd/'.$data['new']['domain'], $data['new']['document_root'].'/'.$log_folder);
 			//* add mountpoint to fstab
-			$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait';
+			$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nofail';
 			$fstab_line .= @($web_config['network_filesystem'] == 'y')?',_netdev    0 0':'    0 0';
 			$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);
 		}
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -619,7 +619,7 @@ function update($event_name, $data) {
 			$app->system->chmod($data['new']['document_root'].'/'.$log_folder, 0755);
 			$app->system->exec_safe('mount --bind ? ?', '/var/log/ispconfig/httpd/'.$data['new']['domain'], $data['new']['document_root'].'/'.$log_folder);
 			//* add mountpoint to fstab
-			$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait';
+			$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nofail';
 			$fstab_line .= @($web_config['network_filesystem'] == 'y')?',_netdev    0 0':'    0 0';
 			$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);
 		}

Original file line number	Diff line number	Diff line change
`@@ -778,7 +778,7 @@ function update($event_name, $data) {`
`778`	`778`	`$app->system->chmod($data['new']['document_root'].'/'.$log_folder, 0755);`
`779`	`779`	`$app->system->exec_safe('mount --bind ? ?', '/var/log/ispconfig/httpd/'.$data['new']['domain'], $data['new']['document_root'].'/'.$log_folder);`
`780`	`780`	`//* add mountpoint to fstab`
`781`		`- $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait';`
	`781`	`+ $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nofail';`
`782`	`782`	`$fstab_line .= @($web_config['network_filesystem'] == 'y')?',_netdev 0 0':' 0 0';`
`783`	`783`	`$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);`
`784`	`784`	`}`
Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,7 @@ function update($event_name, $data) {`
`619`	`619`	`$app->system->chmod($data['new']['document_root'].'/'.$log_folder, 0755);`
`620`	`620`	`$app->system->exec_safe('mount --bind ? ?', '/var/log/ispconfig/httpd/'.$data['new']['domain'], $data['new']['document_root'].'/'.$log_folder);`
`621`	`621`	`//* add mountpoint to fstab`
`622`		`- $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait';`
	`622`	`+ $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nofail';`
`623`	`623`	`$fstab_line .= @($web_config['network_filesystem'] == 'y')?',_netdev 0 0':' 0 0';`
`624`	`624`	`$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);`
`625`	`625`	`}`