summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-02-05 13:57:05 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-02-05 13:57:05 +0000
commit3696d1c16e60b97803a10fff98ea72f28ed0753c (patch)
tree1521e05bc27fff31b6ae8d9960fef6f215624865 /perl-install/standalone
parent6269641f0146553a744ff0ff1d4a45662c466d6b (diff)
downloaddrakx-backup-do-not-use-3696d1c16e60b97803a10fff98ea72f28ed0753c.tar
drakx-backup-do-not-use-3696d1c16e60b97803a10fff98ea72f28ed0753c.tar.gz
drakx-backup-do-not-use-3696d1c16e60b97803a10fff98ea72f28ed0753c.tar.bz2
drakx-backup-do-not-use-3696d1c16e60b97803a10fff98ea72f28ed0753c.tar.xz
drakx-backup-do-not-use-3696d1c16e60b97803a10fff98ea72f28ed0753c.zip
write fstab for /tmp using tmpfs when "clean /tmp" is chosen
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/drakboot14
1 files changed, 11 insertions, 3 deletions
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