summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-18 13:10:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-18 13:10:26 +0000
commitd7b2ab51b319f82cf17fd48e1e8d78fa8d9b1c46 (patch)
tree74992aca6abf52daa6d1ba27c6ebd89f359f6ca6
parent5d620161730c374dabe502a7cdc20215ebd86b79 (diff)
downloaddrakx-d7b2ab51b319f82cf17fd48e1e8d78fa8d9b1c46.tar
drakx-d7b2ab51b319f82cf17fd48e1e8d78fa8d9b1c46.tar.gz
drakx-d7b2ab51b319f82cf17fd48e1e8d78fa8d9b1c46.tar.bz2
drakx-d7b2ab51b319f82cf17fd48e1e8d78fa8d9b1c46.tar.xz
drakx-d7b2ab51b319f82cf17fd48e1e8d78fa8d9b1c46.zip
(fileshare_config): rework the custom message and launch userdrake
(report_bug): add lilo.conf
-rw-r--r--perl-install/any.pm15
1 files changed, 11 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 5ecf79f88..b68f77cc9 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -15,6 +15,7 @@ use lang;
use run_program;
use modules;
use log;
+use c;
sub drakx_version {
sprintf "DrakX v%s built %s", $::testing ? ('TEST', scalar gmtime()) : (split('/', cat_("$ENV{SHARE_PATH}/VERSION")))[2,3];
@@ -905,6 +906,7 @@ sub report_bug {
header("install.log"), cat_("$prefix/root/drakx/install.log"),
header("fstab"), cat_("$prefix/etc/fstab"),
header("modules.conf"), cat_("$prefix/etc/modules.conf"),
+ header("lilo.conf"), cat_("$prefix/etc/lilo.conf"),
header("/etc/modules"), cat_("$prefix/etc/modules"),
map_index { even($::i) ? header($_) : $_ } @other;
}
@@ -959,10 +961,15 @@ Allowing this will permit users to simply click on "Share" in konqueror and naut
setVarsInSh($file, \%conf);
if ($r eq $l[2]) {
# custom
- $in->ask_warn('',
-'The per-user sharing uses the group "fileshare".
-You can use userdrake to add a user in this group.
-Or on the command line use: "usermod -G fileshare,previous_groups user_name"');
+ if ($in->ask_from_('',
+ {
+ -e '/usr/bin/userdrake' ? (ok => _("Launch userdrake")) : (cancel => ''),
+ title =>
+_("The per-user sharing uses the group \"fileshare\".
+You can use userdrake to add a user in this group.")
+ })) {
+ if (fork) { exec "userdrake" or c::_exit(0) }
+ }
}
}