summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--docs/TODO25
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/install2.pm1
-rw-r--r--perl-install/install_steps_gtk.pm4
-rw-r--r--perl-install/interactive_gtk.pm6
-rw-r--r--perl-install/modules.pm1
-rw-r--r--perl-install/share/compssUsers7
-rwxr-xr-xperl-install/standalone/drakxservices15
-rw-r--r--tools/Makefile5
-rwxr-xr-xupdate_kernel2
11 files changed, 51 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index 68e1128b0..adbd28f59 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ upload: tar install
lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/cooker/images ; mput $(ROOTDEST)/images/*.img"
lftp -c "open -u devel mandrakesoft.com; cd ~/tmp ; put $(ROOTDEST)/Mandrake/mdkinst.tgz ; put /tmp/mdkinst_done ; cd ~/cooker/cooker/Mandrake/base ; put $(ROOTDEST)/Mandrake/base/mdkinst_stage2.gz ; put ~/gi/perl-install/compss ; put ~/gi/perl-install/compssList ; put ~/gi/perl-install/compssUsers ; cd ~/cooker/cooker/misc ; put ~/gi/tools/make_mdkinst_stage2 "
- lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/contrib/others/src ; put ~/gi.tar.bz2"
+ lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/contrib/others/src ; put ../gi.tar.bz2"
rm -f $(ROOTDEST)/Mandrake/mdkinst.tgz
rm -f /tmp/mdkinst_done
diff --git a/docs/TODO b/docs/TODO
index 920b502c2..69ab906ff 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,13 +1,24 @@
-crypto dependencies to update
+kdelnk in mandrake_desk (especially Kppp -> Internet)
+removed icons come back later
+
+rpmdrake and same name packages
+
+test drakxservices (on autofs)
+
+segfault in linuxconf (adapter 1 empty)
-mkinitrd and deps
+test delete_event != cancel -> is now good
+
+crypto dependencies to update
mandrake_doc-xx, the symlink is no good in /usr/doc/mandrake as
--------------------------------------------------------------------------------
-(done,fred(removed the call))XFdrake and mousedrake freeze if lothar launches them
+bug in ext2resizing (no sparse superbloc, don't finish properly)
-(done,pix)crypto message
+error handling (like reading hdlist)
+
+smp not detected (mhoward@memphisonline.com on cooker, bios=BP6PW)
bug in kde desktop if keeps home but not an upgrade
@@ -252,3 +263,9 @@ suggested partition tables must be better foreach installClass
(done,pix)on laptop, default to 1024x768
+(done,pix)mkinitrd and deps
+
+(done,fred(removed the call))XFdrake and mousedrake freeze if lothar launches them
+
+(done,pix)crypto message
+
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index d7a9c0c58..3890b77a6 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -11,7 +11,7 @@ STAGE2 = $(ROOTDEST)/Mandrake/base/mdkinst_stage2
BASE = $(ROOTDEST)/Mandrake/base
DESTREP4PMS = $(DEST)$(REP4PMS)
PERL = perl
-LOCALFILES = $(patsubst %, ../tools/%,e2fsck.shared ddcprobe/ddcxinfos pnp_serial/pnp_serial)
+LOCALFILES = $(patsubst %, ../tools/%,e2fsck.shared ddcprobe/ddcxinfos pnp_serial/pnp_serial xhost+)
LOCALFILES2 = extract_archive
DIRS = c Newt po pci_probing resize_fat
EXCLUDE = $(LOCALFILES) boot.img keymaps consolefonts install
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 08d7e0bc0..24489c54e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -367,6 +367,7 @@ sub miscellaneous {
addToBeDone {
setVarsInSh("$o->{prefix}/etc/sysconfig/system", {
HDPARM => $o->{miscellaneous}{HDPARM},
+ CLASS => $::expert && "expert" || $::beginner && "beginner" || "medium",
TYPE => $o->{installClass},
SECURITY => $o->{security},
});
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 5e6963435..94471d205 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -384,8 +384,8 @@ sub choosePackagesTree {
$w->show;
$w->set_sensitive(!$p->{base} && !$p->{installed});
$w->signal_connect(focus_in_event => sub {
- my $p = pkgs::getHeader($p);
- gtktext_insert($info_widget,
+ my $p = eval { pkgs::getHeader($p) };
+ gtktext_insert($info_widget, $@ ? _("Bad package") :
_("Version: %s\n", c::headerGetEntry($p, 'version') . '-' . c::headerGetEntry($p, 'release')) .
_("Size: %d KB\n", c::headerGetEntry($p, 'size') / 1024) .
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 96f383cd1..41338477a 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -25,6 +25,7 @@ sub exit {
sub ask_from_listW {
my ($o, $title, $messages, $l, $def) = @_;
+ my $r;
my $w = my_gtk->new(first(deref($title)), %$o);
$w->{retval} = $def || $l->[0]; #- nearly especially for the X test case (see timeout in Xconfigurator.pm)
@@ -44,11 +45,12 @@ sub ask_from_listW {
);
$defW->grab_focus if $defW;
$w->{rwindow}->set_position('center') if $::isStandalone;
- $w->main;
+ $r = $w->main;
} else {
$w->_ask_from_list($title, $messages, $l, $def);
- $w->main;
+ $r = $w->main;
}
+ $r or die "ask_from_list cancel";
}
sub ask_many_from_list_refW($$$$$) {
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 33f47a122..8c2c82cd4 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -148,6 +148,7 @@ my @drivers_by_category = (
"cdu31a" => "Sony CDU-31A",
"sonycd535" => "Sony CDU-5xx",
"isofs" => "iso9660",
+ "ide-cd" => "ide-cd",
}],
[ 'sound', {
"alsa" => "ALSA sound module, many sound cards",
diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers
index dc78cf2f7..be0bc6a93 100644
--- a/perl-install/share/compssUsers
+++ b/perl-install/share/compssUsers
@@ -48,14 +48,15 @@ System configuration
kde:administration:utilities
Web Server
- daemons:network:http
+ apache
+ mod_perl
+ mod_php3
Network Management Workstation
network:tools
-# above is daemons:network *without* sendmail
+# above is daemons:network *without* sendmail and http
daemons:network:base
daemons:network:ftp
- daemons:network:http
daemons:network:nfs
daemons:network:telnet
BeroList
diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices
index 58f0c39e3..c463308da 100755
--- a/perl-install/standalone/drakxservices
+++ b/perl-install/standalone/drakxservices
@@ -2,8 +2,9 @@
use lib qw(/usr/lib/libDrakX);
-use common qw(:common :functional);
+use common qw(:common :functional :file);
use interactive;
+use log;
local $_ = join '', @ARGV;
@@ -23,7 +24,17 @@ _("Choose which services should be automatically started at boot time"),
mapn {
my ($name, $before, $after) = @_;
if ($before != $after) {
- system("chkconfig", $after ? "--add" : "--del", $name);
+ if ($after) {
+ if (cat_("/etc/rc.d/init.d/$name") =~ /^chkconfig:\s+-/m) {
+ system("chkconfig --add $name");
+ } else {
+ `/sbin/runlevel` =~ /\s(\d+)/ or die "bad runlevel";
+ $1 == 3 || $1 == 5 or log::l("strange runlevel: ``$1'' (neither 3 nor 5)");
+ system("chkconfig --level $1 $name on");
+ }
+ } else {
+ system("chkconfig --del $name");
+ }
}
} \@l, \@before, $after if $after;
diff --git a/tools/Makefile b/tools/Makefile
index 5e4a5764b..3ffd8a0cd 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,16 +7,15 @@ CFLAGS = -Wall
.PHONY: clean install $(DIRS)
-all: $(BASE)/depslist $(BASE)/hdlist $(DIRS) install
+all: $(BASE)/depslist $(BASE)/hdlist $(DIRS) xhost+ install
$(DIRS):
make -C $@
install:
- $(MAKE) gendepslist rpm2header xhost+
+ $(MAKE) gendepslist rpm2header
install make_mdkinst_stage2 gendepslist rpm2header genhdlist $(ROOTDEST)/misc
mkdir -p $(DEST)/usr/bin
- install -s xhost+ $(DEST)/usr/bin
xhost+: %: %.c
$(CC) $(CFLAGS) $< -L/usr/X11R6/lib -lX11 -o $@
diff --git a/update_kernel b/update_kernel
index 7eb75ff3a..77a0b3161 100755
--- a/update_kernel
+++ b/update_kernel
@@ -9,7 +9,7 @@ function f() {
f "scsi|disk" ; SCSI_DRIVERS=$v
f "net" ; NETWORK_DRIVERS=$v
f "scsi|cdrom" ; CD_DRIVERS=$v
-f "pcmcia|paride" ; PCMCIA_DRIVERS=$v
+f "pcmcia" ; PCMCIA_DRIVERS=$v
MISCMODULES="lp.o parport_pc.o parport.o loop.o"
FSMODULES="vfat.o fat.o"