summaryrefslogtreecommitdiffstats
path: root/move
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-06-02 13:57:46 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-06-02 13:57:46 +0000
commitbe72c5e94a95834dbceda0a8835b49ad0af6449b (patch)
tree02a70c64858b4bf6d841569b0cee7d9de283a958 /move
parentd6f2f672def4eec78343947ca5afa95030fed3aa (diff)
downloaddrakx-be72c5e94a95834dbceda0a8835b49ad0af6449b.tar
drakx-be72c5e94a95834dbceda0a8835b49ad0af6449b.tar.gz
drakx-be72c5e94a95834dbceda0a8835b49ad0af6449b.tar.bz2
drakx-be72c5e94a95834dbceda0a8835b49ad0af6449b.tar.xz
drakx-be72c5e94a95834dbceda0a8835b49ad0af6449b.zip
- only look move key in fat partitions
- search for the usb key partition containing a mandrakemove
Diffstat (limited to 'move')
-rwxr-xr-xmove/data/make_i18n_list13
1 files changed, 13 insertions, 0 deletions
diff --git a/move/data/make_i18n_list b/move/data/make_i18n_list
index f4c10ebaa..279bd8a5e 100755
--- a/move/data/make_i18n_list
+++ b/move/data/make_i18n_list
@@ -14,11 +14,24 @@ foreach my $list (glob("*.list")) {
my @pkg_langs = map { /locales-(.*)/ } `$rpm -qa --qf "%{name}\n" locales-*`;
+my %extra_pkgs = (
+ hy => 'fonts-ttf-armenian',
+ ja => 'fonts-ttf-japanese',
+ kn => 'fonts-ttf-kannada',
+ ko => 'fonts-ttf-korean',
+ ta => 'fonts-ttf-tamil fonts-ttf-tscii fonts-bitmap-tscii',
+ th => 'fonts-ttf-thai',
+ zh => 'fonts-ttf-gb2312 taipeifonts fonts-ttf-big5',
+ el => 'fonts-type1-greek',
+ en => 'mandrake_doc-move-en',
+);
+
foreach my $i18n (@pkg_langs) {
#- $i18n_re is different from $i18n because of things like locales-no giving nb|nn|no
my $i18n_re = join('|', uniq($i18n, map { if_(/locales-(\S+)/, $1) } `$rpm -q --provides locales-$i18n`));
my @pkgs = uniq("locales-$i18n", chomp_(`$rpm -q --qf "%{name}\n" --whatrequires locales-$i18n`));
+ push @pkgs, split(' ', $extra_pkgs{$i18n} || '');
my ($dirs, $files) = partition { -d "$prefix$_" } uniq(chomp_(`$rpm -ql @pkgs`));
my @i18n_dirs = uniq(grep { m!/($i18n_re) (_[^/]*)? (\.[^/]*)? (\@[^/]*)?$!x } @$dirs);
+ }
+ $_->{mntpoint} = '/home';
$_->{options} = $key_mountopts;
- eval { fs::mount_part($_); 1 } or delete $_->{mntpoint};
- } key_parts($o);
+ if (eval { fs::mount_part($_); 1 }) {
+ $key_part = $_;
+ last if -e $key_sysconf;
+ } else {
+ delete $_->{mntpoint};
+ }
+ }
+
+
}
sub key_umount {
my ($o) = @_;
- eval { fs::umount_part($_) foreach key_parts($o); 1 };
+ $key_part or return;
+
+ eval {
+ fs::umount_part($key_part);
+ undef $key_part;
+ 1;
+ };
}
sub machine_ident() {
@@ -531,7 +552,6 @@ Continue at your own risk."), formatError($@) ]) if $@;
sub install_TrueFS_in_home {
my ($o) = @_;
- require fsedit;
my $home = fsedit::mntpoint2part('/home', $o->{fstab}) or return;
my %loopbacks = map {