Commit 0ce3c7b9 authored by Till Brehm's avatar Till Brehm
Browse files

Replaced the deprecated nobootwait option with nofail option in bind mount lines in /etc/fstab

parent 4f5967a4

server/plugins-available/apache2_plugin.inc.php

+2 −2
Original line number Diff line number Diff line
@@ -681,10 +681,10 @@ class apache2_plugin { 
			$fstab_line_old = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.'    none    bind';

			

			if($web_config['network_filesystem'] == 'y') {

				$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait,_netdev    0 0';

				$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nofail,_netdev    0 0';

				$app->system->replaceLine('/etc/fstab', $fstab_line_old, $fstab_line, 0, 1);

			} else {

				$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait    0 0';

				$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nofail    0 0';

				$app->system->replaceLine('/etc/fstab', $fstab_line_old, $fstab_line, 0, 1);

			}

server/plugins-available/nginx_plugin.inc.php

+2 −2
Original line number Diff line number Diff line
@@ -528,10 +528,10 @@ class nginx_plugin { 
			$fstab_line_old = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.'    none    bind';

			

			if($web_config['network_filesystem'] == 'y') {

				$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait,_netdev    0 0';

				$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nofail,_netdev    0 0';

				$app->system->replaceLine('/etc/fstab', $fstab_line_old, $fstab_line, 0, 1);

			} else {

				$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait    0 0';

				$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nofail    0 0';

				$app->system->replaceLine('/etc/fstab', $fstab_line_old, $fstab_line, 0, 1);

			}