Attachment 5990 Details for Bug 10179 – Patch to add nofail option when diskdrake writes /etc/fstab

Patch to add nofail option when diskdrake writes /etc/fstab

fs-nofail.diff (text/plain), 1.17 KB, created by Martin Whitaker on 2015-03-04 22:48:33 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2015-03-04 22:48:33 CET

Size: 1.17 KB

patch

obsolete

>--- /lib/libDrakX/fs.pm.orig	2015-03-04 18:54:41.132893784 +0000
>+++ /lib/libDrakX/fs.pm	2015-03-04 20:45:08.439576940 +0000
>@@ -214,10 +214,11 @@
> 	}
> 	my $mntpoint = fs::type::carry_root_loopback($_) ? '/initrd/loopfs' : $real_mntpoint;
> 
>+	my $needed_to_boot = member($_->{mntpoint}, fs::type::directories_needed_to_boot());
> 	my ($freq, $passno) =
> 	  exists $_->{freq} ?
> 	    ($_->{freq}, $_->{passno}) :
>-	  isTrueLocalFS($_) && !$_->{dmcrypt_name} && $_->{options} !~ /encryption=/ && (!$_->{is_removable} || member($_->{mntpoint}, fs::type::directories_needed_to_boot())) ? 
>+	  isTrueLocalFS($_) && !$_->{dmcrypt_name} && $_->{options} !~ /encryption=/ && (!$_->{is_removable} || $needed_to_boot) ? 
> 	    (1, $_->{mntpoint} eq '/' ? 1 : fs::type::carry_root_loopback($_) ? 0 : 2) : 
> 	    (0, 0);
> 
>@@ -227,6 +228,9 @@
> 	    $new{$mntpoint} = 1;
> 
> 	    my $options = $_->{options} || 'defaults';
>+	    if (($_->{is_removable} || member($_->{fs_type}, 'ntfs', 'ntfs-3g')) && !$needed_to_boot && $_->{options} !~ /nofail/) {
>+		$options = $options . ',nofail';
>+	    }
> 
> 	    if ($_->{fs_type} eq 'cifs' && $options =~ /password=/ && !$b_keep_credentials) {
> 		require fs::remote::smb;

--- /lib/libDrakX/fs.pm.orig	2015-03-04 18:54:41.132893784 +0000
+++ /lib/libDrakX/fs.pm	2015-03-04 20:45:08.439576940 +0000
@@ -214,10 +214,11 @@
 	}
 	my $mntpoint = fs::type::carry_root_loopback($_) ? '/initrd/loopfs' : $real_mntpoint;
 
+	my $needed_to_boot = member($_->{mntpoint}, fs::type::directories_needed_to_boot());
 	my ($freq, $passno) =
 	  exists $_->{freq} ?
 	    ($_->{freq}, $_->{passno}) :
-	  isTrueLocalFS($_) && !$_->{dmcrypt_name} && $_->{options} !~ /encryption=/ && (!$_->{is_removable} || member($_->{mntpoint}, fs::type::directories_needed_to_boot())) ? 
+	  isTrueLocalFS($_) && !$_->{dmcrypt_name} && $_->{options} !~ /encryption=/ && (!$_->{is_removable} || $needed_to_boot) ? 
 	    (1, $_->{mntpoint} eq '/' ? 1 : fs::type::carry_root_loopback($_) ? 0 : 2) : 
 	    (0, 0);
 
@@ -227,6 +228,9 @@
 	    $new{$mntpoint} = 1;
 
 	    my $options = $_->{options} || 'defaults';
+	    if (($_->{is_removable} || member($_->{fs_type}, 'ntfs', 'ntfs-3g')) && !$needed_to_boot && $_->{options} !~ /nofail/) {
+		$options = $options . ',nofail';
+	    }
 
 	    if ($_->{fs_type} eq 'cifs' && $options =~ /password=/ && !$b_keep_credentials) {
 		require fs::remote::smb;

Actions: View

Attachments on bug 10179: 5990