summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-02-28 20:55:37 +0000
committerdamien <damien@mandriva.com>2001-02-28 20:55:37 +0000
commita28cb977fa517e2f174e943fa4e7562b1f322c63 (patch)
treeec6113913c53e4121eeafc63cb57e2c0e1db74bd
parent28222e49a787db840ca41fc9918752f73229cc05 (diff)
downloaddrakx-a28cb977fa517e2f174e943fa4e7562b1f322c63.tar
drakx-a28cb977fa517e2f174e943fa4e7562b1f322c63.tar.gz
drakx-a28cb977fa517e2f174e943fa4e7562b1f322c63.tar.bz2
drakx-a28cb977fa517e2f174e943fa4e7562b1f322c63.tar.xz
drakx-a28cb977fa517e2f174e943fa4e7562b1f322c63.zip
test if gtk -> bootlookdrake, else drakboot
-rwxr-xr-xperl-install/standalone/drakboot23
1 files changed, 12 insertions, 11 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 7e73f5092..827ec1a52 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -2,17 +2,16 @@
use lib qw(/usr/lib/libDrakX);
-require bootlook;
-
-#-use common qw(:common :file :functional);
-#-use interactive;
-#-use standalone;
-#-use any;
-#-use bootloader;
-#-use detect_devices;
-#-use fsedit;
-#-use fs;
-#-use c;
+
+use common qw(:common :file :functional);
+use interactive;
+use standalone;
+use any;
+use bootloader;
+use detect_devices;
+use fsedit;
+use fs;
+use c;
$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
local $_ = join '', @ARGV;
@@ -23,6 +22,8 @@ $::expert = /-expert/;
my $in = interactive->vnew('su');
+require bootlook if ref($in) =~ /gtk/;
+
if (!$::isEmbedded) {
my %l = (
arch() !~ /sparc|alpha/ ? (