summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/XFdrake
blob: 072f770a1ec7ba4e8fdf52ce5fe64d9c83fccdde (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
#!/usr/bin/perl

# XFdrake
# Copyright (C) 1999 MandrakeSoft (pixel@linux-mandrake.com)
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

use lib qw(/usr/lib/libDrakX);

use interactive;
use Xconfigurator;
use Xconfig;
use c;

local $_ = join '', @ARGV;

/-h/ and die "usage: XFdrake [--xf3] [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";

my $i = {};

$::isStandalone = 1;
$::force_xf3 = /-xf3/;
$::beginner = /-beginner/;
$::expert = /-expert/;
$::auto = /-auto/;
$::noauto = /-noauto/;
$::testing = /-testing/;
$i->{skiptest} = /-skiptest/;

my $f = "/usr/X11R6/lib/X11/Cards";
-e $f or system("urpmi --auto XFree86 XFree86-75dpi-fonts");
-e $f or die "install XFree86 first!\n";

my $in = vnew interactive('su');

`pidof xfs` > 0 or system("/etc/rc.d/init.d/xfs start");

system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing

Xconfig::getinfoFromXF86Config($i) if $0 =~ Xdrakres;
Xconfig::getinfo($i);

Xconfigurator::main('', $i, $in, 0, -e "/etc/pcmcia", sub { system("urpmi --auto XFree86-$_[0]") });

$in->exit(0);
m b/perl-install/my_gtk.pm
index 0a0c721e0..d77434780 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -95,13 +95,14 @@ sub new {
$::WizardTable->attach($o->{window}, 0, 2, 1, 2, [-fill, -expand], [-fill, -expand], 0, 0);
}
- $::isEmbedded && !$my_gtk::pop_it && !eval { $::Plug->child } or return $o;
- $o->{window} = new Gtk::HBox(0,0);
- $o->{rwindow} = $o->{window};
- $::Plug ||= new Gtk::Plug ($::XID);
- $::Plug->show;
- flush();
- $::Plug->add($o->{window});
+ if ($::isEmbedded && !$my_gtk::pop_it && !eval { $::Plug->child }) {
+ $o->{window} = new Gtk::HBox(0,0);
+ $o->{rwindow} = $o->{window};
+ $::Plug ||= new Gtk::Plug ($::XID);
+ $::Plug->show;
+ flush();
+ $::Plug->add($o->{window});
+ }
$::CCPID and kill "USR2", $::CCPID;
$o;
}