summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog8
-rw-r--r--perl-install/install_any.pm4
-rw-r--r--perl-install/install_steps.pm6
-rw-r--r--perl-install/services.pm8
4 files changed, 20 insertions, 6 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 3a461663b..165dc1e6d 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,11 @@
+2000-05-03 Pixel <pixel@mandrakesoft.com>
+
+ * services.pm (drakxservices): stop immediately service if removed
+
+ * install_steps.pm (configureNetwork): replaced dhcpxd by dhcpcd
+ * install_steps.pm (afterInstallPackages): touch some files to
+ please linuxconf
+
2000-05-03 François Pons <fpons@mandrakesoft.com>
* install_steps.pm: updated min size, fixed kppprc generation.
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index a43a33be2..11df7afe3 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -34,7 +34,7 @@ use log;
XFree86-8514 XFree86-AGX XFree86-Mach32 XFree86-Mach64 XFree86-Mach8 XFree86-Mono
XFree86-P9000 XFree86-S3 XFree86-S3V XFree86-SVGA XFree86-W32 XFree86-I128
XFree86-Sun XFree86-SunMono XFree86-Sun24 XFree86-3DLabs XFree86-FBDev XFree86-server
-XFree86 dhcpxd pump ppp ypbind rhs-printfilters pnm2ppa samba ncpfs kernel-fb
+XFree86 dhcpcd pump ppp ypbind rhs-printfilters pnm2ppa samba ncpfs kernel-fb
);
#-######################################################################################
@@ -254,7 +254,7 @@ sub setPackages($) {
push @{$o->{default_packages}}, "raidtools" if $o->{raid} && !is_empty_array_ref($o->{raid}{raid});
push @{$o->{default_packages}}, "reiserfs-utils" if grep { isReiserfs($_) } @{$o->{fstab}};
push @{$o->{default_packages}}, "cdrecord" if detect_devices::getIDEBurners();
- push @{$o->{default_packages}}, "alsa" if modules::get_alias("sound") =~ /^snd-card-/;
+ push @{$o->{default_packages}}, "alsa", "alsa-utils" if modules::get_alias("sound") =~ /^snd-card-/;
pkgs::getDeps($o->{prefix}, $o->{packages});
pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1);
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 867135dfb..c47099400 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -419,6 +419,10 @@ GridHeight=70
} "$o->{prefix}$_/.kde/share/config/kfmrc"
}
+ #- to unsure linuxconf doesn't cry against those files being in the future
+ -e $_ and touch($_) foreach map { "$o->{prefix}/$_" }
+ '/etc/conf.modules', '/etc/crontab', '/etc/sysconfig/network', '/etc/sysconfig/mouse', '/etc/X11/fs/config';
+
#- move some file after an upgrade that may be seriously annoying.
#- and rename saved files to .mdkgiorig.
if ($o->{isUpgrade}) {
@@ -450,7 +454,7 @@ sub configureNetwork($) {
network::sethostname($o->{netc}) unless $::testing;
network::addDefaultRoute($o->{netc}) unless $::testing;
- $o->pkg_install("dhcpxd") if grep { $_->{BOOTPROTO} =~ /^(dhcp)$/ } @{$o->{intf}};
+ $o->pkg_install("dhcpcd") if grep { $_->{BOOTPROTO} =~ /^(dhcp)$/ } @{$o->{intf}};
# Handle also pump (this is still in initscripts no?)
$o->pkg_install("pump") if grep { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } @{$o->{intf}};
#-res_init(); #- reinit the resolver so DNS changes take affect
diff --git a/perl-install/services.pm b/perl-install/services.pm
index d43867268..4f3c1d81f 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -95,12 +95,14 @@ sub drakxservices {
mapn {
my ($name, $before, $after) = @_;
if ($before != $after) {
+ my $script = "/etc/rc.d/init.d/$name";
run_program::rooted($prefix, "chkconfig", $after ? "--add" : "--del", $name);
- if ($after && cat_("$prefix/etc/rc.d/init.d/$name") =~ /^#\s+chkconfig:\s+-/m) {
- #- `/sbin/runlevel` =~ /\s(\d+)/ or die "bad runlevel";
- #- $1 == 3 || $1 == 5 or log::l("strange runlevel: ``$1'' (neither 3 nor 5)");
+ if ($after && cat_("$prefix$script") =~ /^#\s+chkconfig:\s+-/m) {
run_program::rooted($prefix, "chkconfig", "--level", "35", $name, "on");
}
+ if (!$after && $::isStandalone) {
+ run_program::rooted($prefix, $script, "stop");
+ }
}
} \@l, \@before, $after;
}