summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2002-01-10 15:26:26 +0000
committerdamien <damien@mandriva.com>2002-01-10 15:26:26 +0000
commit9eb1688b18e4241692b80afd363cdce2a1b1b844 (patch)
treeaa875a241294f7ba8b1697e89fb379cb3035b988
parent6133180ed6fbecc3a345c1721b64d38d6483ffa2 (diff)
downloaddrakx-9eb1688b18e4241692b80afd363cdce2a1b1b844.tar
drakx-9eb1688b18e4241692b80afd363cdce2a1b1b844.tar.gz
drakx-9eb1688b18e4241692b80afd363cdce2a1b1b844.tar.bz2
drakx-9eb1688b18e4241692b80afd363cdce2a1b1b844.tar.xz
drakx-9eb1688b18e4241692b80afd363cdce2a1b1b844.zip
domainname corection
-rw-r--r--perl-install/install_steps_gtk.pm3
-rw-r--r--perl-install/network/network.pm4
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 175ece0ea..4939a539a 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -537,13 +537,16 @@ sub installPackages {
log::l("advertising $f");
eval { my $pl = $f; $pl =~ s/\.png$/\.pl/;
my ($width, $height, @data);
+ $in->ask_warn('', "avant evalcat");
eval(cat_($pl));
+ $in->ask_warn('', "wi : $width | he : $height \ndata :\n @data");
my ($pix, undef) = gtkcreate_png($f);
my $dbl_area;
my $darea = new Gtk::DrawingArea;
gtkpack($box, $advertising = gtksignal_connect(gtkset_usize($darea, $width, $height), expose_event => sub {
eval {
if (!defined($dbl_area)) {
+ $in->ask_warn('', "pix $pix | darea $darea \n ");
$dbl_area = new Gtk::Gdk::Pixmap($darea->window, $width, $height);
$dbl_area->draw_pixmap($darea->style->bg_gc('normal'),
$pix, 0, 0, $width, $height);
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index ee62d089d..cfcb9ac31 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -66,12 +66,12 @@ sub down_it {
sub write_conf {
my ($file, $netc) = @_;
+ ($netc->{DOMAINNAME}) ||= 'localdomain';
add2hash($netc, {
NETWORKING => "yes",
FORWARD_IPV4 => "false",
- HOSTNAME => "localhost.localdomain",
+ HOSTNAME => "localhost.$netc->{DOMAINNAME}",
});
- ($netc->{DOMAINNAME}) ||= ($netc->{HOSTNAME} =~ /\.(.*)/);
setVarsInSh($file, $netc, qw(NETWORKING FORWARD_IPV4 DHCP_HOSTNAME HOSTNAME DOMAINNAME GATEWAY GATEWAYDEV NISDOMAIN));
}