summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-22 13:44:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-22 13:44:12 +0000
commit00dbdf714c849804da486511c2cb6fc492f70067 (patch)
treea000d2a070b6f1379064d4a5cb435d9b29b369b4 /perl-install
parent3cf37a6c5c6237aa2afc34e03141eca3b7dd9caa (diff)
downloaddrakx-00dbdf714c849804da486511c2cb6fc492f70067.tar
drakx-00dbdf714c849804da486511c2cb6fc492f70067.tar.gz
drakx-00dbdf714c849804da486511c2cb6fc492f70067.tar.bz2
drakx-00dbdf714c849804da486511c2cb6fc492f70067.tar.xz
drakx-00dbdf714c849804da486511c2cb6fc492f70067.zip
use modules::mergein_conf so that USB availability test works
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/XFdrake2
1 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index a06d3ed0c..c02a003e2 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -49,6 +49,8 @@ begin:
{
my $in = 'interactive'->vnew('su', 'X');
+ modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf';
+
$::isEmbedded and kill 'USR2', $::CCPID;
my $rc = do {