From 3696d1c16e60b97803a10fff98ea72f28ed0753c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 5 Feb 2004 13:57:05 +0000 Subject: write fstab for /tmp using tmpfs when "clean /tmp" is chosen --- perl-install/standalone/drakboot | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'perl-install') diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 2d5b06d32..c065eb634 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -212,12 +212,20 @@ $in->exit(0); sub lilo_choice() { my $bootloader = bootloader::read(); - my ($all_hds) = fsedit::get_hds(); + my $all_hds = fsedit::get_hds(); + fs::get_raw_hds('', $all_hds); + fs::get_info_from_fstab($all_hds, ''); my $fstab = [ fsedit::get_all_fstab($all_hds) ]; - fs::merge_info_from_fstab($fstab, '', 0, undef); ask: - eval { any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL}) }; + eval { + my $before = fs::fstab_to_string($all_hds); + any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL}); + if ($before ne fs::fstab_to_string($all_hds)) { + #- for /tmp using tmpfs when "clean /tmp" is chosen + fs::write_fstab($all_hds); + } + }; my $err = $@; if ($err && $err !~ /wizcancel/) { # BUG: note that the following message won't speak about the right bootloader if user is currently switching between -- cgit v1.2.1