aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/migration/data/v310/rc6.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-06-24 00:19:30 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-06-24 00:19:30 +0200
commitba456bb00ea161ff17311689cdc4bcc8657bb32d (patch)
treea0f9297d59151bd864f193181fd9959ecdb500f8 /phpBB/phpbb/db/migration/data/v310/rc6.php
parent83326718132811d8b57ac8612ff50887ec0fa101 (diff)
parent307c9bc15f2ff33222375ba53b0e9979aef35f22 (diff)
downloadforums-ba456bb00ea161ff17311689cdc4bcc8657bb32d.tar
forums-ba456bb00ea161ff17311689cdc4bcc8657bb32d.tar.gz
forums-ba456bb00ea161ff17311689cdc4bcc8657bb32d.tar.bz2
forums-ba456bb00ea161ff17311689cdc4bcc8657bb32d.tar.xz
forums-ba456bb00ea161ff17311689cdc4bcc8657bb32d.zip
Merge pull request #2643 from nickvergessen/ticket/12763
Ticket/12763 Do not regenerate the *_schema.sql files * nickvergessen/ticket/12763: [ticket/12763] Remove invalid comment from oracle and postgres *_schema.sql [ticket/12763] Remove empty schema files [ticket/12763] Do not regenerate the *_schema.sql files
Diffstat (limited to 'phpBB/phpbb/db/migration/data/v310/rc6.php')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-26 04:38:16 +0000
67d643ed09d88b'>548a3ec969a51578d3bb39719c6b7804542750d4 /perl-install/fs.pm parent08135ef65a4f8d3e3c5ccf4707f4199d335eeaa9 (diff)downloaddrakx-f26011903cf11a33656c023a2367d643ed09d88b.tar
drakx-f26011903cf11a33656c023a2367d643ed09d88b.tar.gz
drakx-f26011903cf11a33656c023a2367d643ed09d88b.tar.bz2
drakx-f26011903cf11a33656c023a2367d643ed09d88b.tar.xz
drakx-f26011903cf11a33656c023a2367d643ed09d88b.zip
(prepare_write_fstab): no need to read the fstab once again before writing since reading takes care of everything, including unknown entries (which go to {special}). This fixes a bug when removing existing partition with associated mount point. It used to keep the entry in fstab, which is wrong (as reported by andré <naderrt@wanadoo.fr>)
Diffstat (limited to 'perl-install/fs.pm')
-rw-r--r--perl-install/fs.pm14
1 files changed, 2 insertions, 12 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 63e03f542..4ebf33f37 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -196,17 +196,7 @@ sub prepare_write_fstab {
my ($all_hds, $prefix, $keep_smb_credentials) = @_;
$prefix ||= '';
- my @l1 = (fsedit::get_really_all_fstab($all_hds), @{$all_hds->{special}});
- my @l2 = read_fstab($prefix, "/etc/fstab", 'all_options');
-
- {
- #- remove entries from @l2 that are given by @l1
- #- this is needed to allow to unset a mount point
- my %new;
- $new{$_->{device}} = 1 foreach @l1;
- delete $new{none}; #- special case for device "none" which can be _mounted_ more than once
- @l2 = grep { !$new{$_->{device}} } @l2;
- }
+ my @l_in = (fsedit::get_really_all_fstab($all_hds), @{$all_hds->{special}});
my %new;
my @smb_credentials;
@@ -270,7 +260,7 @@ sub prepare_write_fstab {
} else {
()
}
- } grep { $_->{device} && ($_->{mntpoint} || $_->{real_mntpoint}) && $_->{type} } (@l1, @l2);
+ } grep { $_->{device} && ($_->{mntpoint} || $_->{real_mntpoint}) && $_->{type} } @l_in;
join('', map { $_->[1] } sort { $a->[0] cmp $b->[0] } @l), \@smb_credentials;
}
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-26 04:38:16 +0000