Remove "Clean /tmp at each boot" option

Not needed since systemd automatically already sets up /tmp using tmpfs.
Proposed and accepted on dev mailing list.

1 files changed, 3 insertions, 11 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 4c3b33d33..27bae9ac1 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -234,7 +234,9 @@ sub setupBootloaderUntilInstalled {
         my $before = fs::fstab_to_string($all_hds);
         setupBootloader($in, $b, $all_hds, $fstab, $security) or $in->exit;
         if ($before ne fs::fstab_to_string($all_hds)) {
-            #- for /tmp using tmpfs when "clean /tmp" is chosen
+            #- ovitters: This fstab comparison was needed for optionally
+            #- setting up /tmp using tmpfs. That code was removed. Not removing
+            #- this code as I'm not sure if something still relies on this
             fs::write_fstab($all_hds);
         }
     } while !installBootloader($in, $b, $all_hds);
@@ -397,7 +399,6 @@ sub setupBootloader__general {
     my $prev_enable_apic = my $enable_apic = !bootloader::get_append_simple($b, 'noapic');
     my $prev_enable_lapic = my $enable_lapic = !bootloader::get_append_simple($b, 'nolapic');
     my $prev_enable_smp = my $enable_smp = !bootloader::get_append_simple($b, 'nosmp');
-    my $prev_clean_tmp = my $clean_tmp = any { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special} ||= []};
     my $prev_boot = $b->{boot};
     my $prev_method = $b->{method};
 
@@ -446,7 +447,6 @@ sub setupBootloader__general {
 		  $ok && $ok2;
 	      } },
             { label => N("Password (again)"), val => \$b->{password2}, hidden => 1 },
-            { text => N("Clean /tmp at each boot"), val => \$clean_tmp, type => 'bool', advanced => 1 },
         ]) or return 0;
     } else {
 	$b->{boot} = $partition_table::mac::bootstrap_part;	
@@ -496,14 +496,6 @@ sub setupBootloader__general {
 	($enable_lapic ? \&bootloader::set_append_simple : \&bootloader::remove_append_simple)->($b, 'lapic');
     }
 
-    if ($prev_clean_tmp != $clean_tmp) {
-	if ($clean_tmp && !fs::get::has_mntpoint('/tmp', $all_hds)) {
-	    push @{$all_hds->{special}}, { device => 'none', mntpoint => '/tmp', fs_type => 'tmpfs' };
-	} else {
-	    @{$all_hds->{special}} = grep { $_->{mntpoint} ne '/tmp' } @{$all_hds->{special}};
-	}
-    }
-
     if (bootloader::main_method($prev_method) eq 'lilo' && 
 	bootloader::main_method($b->{method}) eq 'grub') {
 	log::l("switching for lilo to grub, ensure we don't read lilo.conf anymore");