Skip to content

Commit 0ce3c7b

Browse files
author
Till Brehm
committed
Replaced the deprecated nobootwait option with nofail option in bind mount lines in /etc/fstab
1 parent 4f5967a commit 0ce3c7b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

server/plugins-available/apache2_plugin.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -681,10 +681,10 @@ function update($event_name, $data) {
681681
$fstab_line_old = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.' none bind';
682682

683683
if($web_config['network_filesystem'] == 'y') {
684-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait,_netdev 0 0';
684+
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nofail,_netdev 0 0';
685685
$app->system->replaceLine('/etc/fstab', $fstab_line_old, $fstab_line, 0, 1);
686686
} else {
687-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait 0 0';
687+
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nofail 0 0';
688688
$app->system->replaceLine('/etc/fstab', $fstab_line_old, $fstab_line, 0, 1);
689689
}
690690

server/plugins-available/nginx_plugin.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,10 +528,10 @@ function update($event_name, $data) {
528528
$fstab_line_old = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$old_log_folder.' none bind';
529529

530530
if($web_config['network_filesystem'] == 'y') {
531-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait,_netdev 0 0';
531+
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nofail,_netdev 0 0';
532532
$app->system->replaceLine('/etc/fstab', $fstab_line_old, $fstab_line, 0, 1);
533533
} else {
534-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait 0 0';
534+
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nofail 0 0';
535535
$app->system->replaceLine('/etc/fstab', $fstab_line_old, $fstab_line, 0, 1);
536536
}
537537

0 commit comments

Comments
 (0)