summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-20 20:32:11 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-20 20:32:11 +0000
commit346c0a0130a7c5a7b30e1c18aa96c1537000a21f (patch)
treeaa42826e5564b0f3a07c4510936b354ae15ca83e /perl-install
parent6a01bfbae9fd79d744002b479c47086edd2d7562 (diff)
downloaddrakx-346c0a0130a7c5a7b30e1c18aa96c1537000a21f.tar
drakx-346c0a0130a7c5a7b30e1c18aa96c1537000a21f.tar.gz
drakx-346c0a0130a7c5a7b30e1c18aa96c1537000a21f.tar.bz2
drakx-346c0a0130a7c5a7b30e1c18aa96c1537000a21f.tar.xz
drakx-346c0a0130a7c5a7b30e1c18aa96c1537000a21f.zip
load fuse module automatically when trying to mount NTFS-3G (mga#5685)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs/mount.pm1
-rw-r--r--perl-install/install/NEWS2
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm
index d929a4ecf..aee0ea97a 100644
--- a/perl-install/fs/mount.pm
+++ b/perl-install/fs/mount.pm
@@ -83,6 +83,7 @@ sub mount {
push @mount_opt, 'ro' if $b_rdonly;
$o_wait_message->(N("Mounting partition %s", $dev)) if $o_wait_message;
+ modules::load("fuse") if $::isInstall && $fs eq 'ntfs-3g' && ! -e '/dev/fuse';
run_program::run('mount', '-t', $fs, $dev, $where, if_(@mount_opt, '-o', join(',', @mount_opt))) or die N("mounting partition %s in directory %s failed", $dev, $where);
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b4fd43f2f..8546405c6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- load fuse module automatically when trying to mount NTFS-3G (mga#5685)
+
Version 14.44.1 - 16 September 2012
- add spacing between license paragraphs
@ my $yesexpr =
N("Yy");
sub usage() {
- print N("urpme version %s
-%s
-This is free software and may be redistributed under the terms of the GNU GPL.
-
-usage:
-", $urpm::VERSION,
- N("Copyright (C) %s by %s", "1999-2010", "Mandriva") .
- N("Copyright (C) %s by %s", "2012", "Mageia")
- ) . N(" --help - print this help message.
+ print urpm::args::copyright('urpme', [ '1999-2010', 'Mandriva' ], [ '2012', 'Mageia' ])
+ . N(" --help - print this help message.
") . N(" --auto - automatically select a package in choices.
") . N(" --auto-orphans - remove orphans
") . N(" --test - verify if the removal can be achieved correctly.
diff --git a/urpmf b/urpmf
index a6b6ab37..24261b0e 100755
--- a/urpmf
+++ b/urpmf
@@ -26,15 +26,7 @@ use urpm::msg;
use urpm::media;
sub usage() {
- print N("urpmf version %s
-%s
-This is free software and may be redistributed under the terms of the GNU GPL.
-
-usage: urpmf [options] pattern-expression
-", $urpm::VERSION,
- N("Copyright (C) %s by %s", "2002-2010", "Mandriva") .
- N("Copyright (C) %s by %s", "2012", "Mageia")
- )
+ print urpm::args::copyright('urpmf', [ '2002-2010', 'Mandriva' ], [ '2011-2012', 'Mageia' ])
. N(" --help - print this help message.
") . N(" --version - print this tool's version number.
") . N(" --env - use specific environment (typically a bug report).
diff --git a/urpmi b/urpmi
index 9fbbb013..26312f38 100755
--- a/urpmi
+++ b/urpmi
@@ -63,15 +63,8 @@ $ENV{HOME} ||= "/root";
$ENV{USER} ||= "root";
sub usage () {
- print N("urpmi version %s
-%s
-This is free software and may be redistributed under the terms of the GNU GPL.
-
-usage:
-", $urpm::VERSION,
- N("Copyright (C) %s by %s", "1999-2010", "Mandriva") .
- N("Copyright (C) %s by %s", "2011-2012", "Mageia")
- ) . N(" --help - print this help message.
+ print urpm::args::copyright('urpmi', [ '1999-2010', 'Mandriva' ], [ '2011-2012', 'Mageia' ])
+ . N(" --help - print this help message.
") . N(" --media - use only the given media, separated by comma.
") . N(" --excludemedia - do not use the given media, separated by comma.
") . N(" --update - use only update media.
diff --git a/urpmi.recover b/urpmi.recover
index dc7e4dae..756754a0 100644
--- a/urpmi.recover
+++ b/urpmi.recover
@@ -25,14 +25,8 @@ our $rollback;
our $disable;
sub usage () {
- print N("urpmi.recover version %s
-%s
-This is free software and may be redistributed under the terms of the GNU GPL.
-
-usage:
-", $urpm::VERSION,
- N("Copyright (C) %s by %s", "2006-2010", "Mandriva")
- ) . N(" --help - print this help message.
+ print urpm::args::copyright('urpmi.recover', [ '2006-2010', 'Mandriva' ])
+ . N(" --help - print this help message.
") . N(" --checkpoint - set repackaging start now
") . N(" --noclean - don't clean repackage directory on checkpoint
") . N(" --urpmi-root - use another root for urpmi db & rpm installation.
diff --git a/urpmq b/urpmq
index e6bb1083..12364bb5 100755
--- a/urpmq
+++ b/urpmq
@@ -37,15 +37,8 @@ our @names;
our @src_names;
sub usage() {
- print N("urpmq version %s
-%s
-This is free software and may be redistributed under the terms of the GNU GPL.
-
-usage:
-", $urpm::VERSION,
- N("Copyright (C) %s by %s", '2000-2010', 'Mandriva') .
- N("Copyright (C) %s by %s", '2012', 'Mandriva')
- ) . N(" --help - print this help message.
+ print urpm::args::copyright('urpmq', $urpm::VERSION, [ '2000-2010', 'Mandriva' ], [ '2012', 'Mageia' ])
+ . N(" --help - print this help message.
") . N(" --update - use only update media.
") . N(" --media - use only the given media, separated by comma.
") . N(" --searchmedia - use only the given media to search requested (or updated) packages.