summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-12-15 19:44:29 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-12-15 19:44:29 +0000
commit405fee60d1e1137611dae9783ae370563c901967 (patch)
treee6178c064c6908a7aef5df4ade4454aed99def22
parent6e1499a56590006f2a11ab711804fee205311c36 (diff)
downloaddrakx-405fee60d1e1137611dae9783ae370563c901967.tar
drakx-405fee60d1e1137611dae9783ae370563c901967.tar.gz
drakx-405fee60d1e1137611dae9783ae370563c901967.tar.bz2
drakx-405fee60d1e1137611dae9783ae370563c901967.tar.xz
drakx-405fee60d1e1137611dae9783ae370563c901967.zip
no_comment
-rw-r--r--perl-install/fsedit.pm10
-rw-r--r--perl-install/install2.pm3
-rw-r--r--perl-install/interactive_gtk.pm4
-rw-r--r--perl-install/share/compssList3
-rwxr-xr-xperl-install/standalone/draksec2
-rwxr-xr-xtools/make_mdkinst_stage22
6 files changed, 18 insertions, 6 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 4e31ae49a..f29f47959 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -340,6 +340,16 @@ sub move {
}
}
+sub change_type($$$) {
+ my ($hd, $part, $type) = @_;
+ $type != $part->{type} or return;
+ $hd->{isDirty} = 1;
+ $part->{mntpoint} = '' if isSwap($part) && $part->{mntpoint} eq "swap";
+ $part->{type} = $type;
+ $part->{notFormatted} = 1;
+ $part->{isFormatted} = 0;
+}
+
sub rescuept($) {
my ($hd) = @_;
my ($ext, @hd);
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index e585e7eb8..4954c9b27 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -339,7 +339,8 @@ sub choosePackages {
$o->setPackages if $_[1] == 1;
$o->selectPackagesToUpgrade($o) if $o->{isUpgrade} && $_[1] == 1;
unless ($o->{isUpgrade}) {
- $o->choosePackages($o->{packages}, $o->{compss}, $o->{compssUsers}, $_[1] == 1);
+ $o->choosePackages($o->{packages}, $o->{compss},
+ $o->{compssUsers}, $o->{compssUsersSorted}, $_[1] == 1);
pkgs::unselect($o->{packages}, $o->{packages}{kdesu}) if $o->{packages}{kdesu} && $o->{security} > 3;
$o->{packages}{$_}{selected} = 1 foreach @{$o->{base}}; #- already done by selectPackagesToUpgrade.
}
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 049c25753..faa26a7e3 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -47,7 +47,7 @@ sub ask_from_listW {
),
);
$defW->grab_focus if $defW;
- $w->{rwindow}->set_position('center');
+ $w->{rwindow}->set_position('center') if $::isStandalone;
$w->main;
} else {
$w->_ask_from_list($title, $messages, $l, $def);
@@ -213,7 +213,7 @@ sub wait_messageW($$$) {
gtkpack(new Gtk::VBox(0,0),
@$messages,
$w->{wait_messageW} = new Gtk::Label($W)));
- $w->{rwindow}->set_position('center');
+ $w->{rwindow}->set_position('center') if $::isStandalone;
$w->{wait_messageW}->signal_connect(expose_event => sub { $w->{displayed} = 1 });
$w->sync until $w->{displayed};
$w;
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index a973ff6e2..913cdc960 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -56,7 +56,6 @@ chkfontpath 0 0 50
chos 0 0 0
chos-vchos 0 0 0
cleanfeed 24 99 21
-colorgcc 10 0 84
comanche 22 78 0
compat-glibc 0 0 40
comsat 0 30 2
@@ -135,6 +134,7 @@ gaddr 45 0 40
gated 0 80 0
gatos 55 0 49
gawk 10 0 87
+gawk-doc 10 0 50
gcc 50 0 90
gcc-c++ 15 0 84
gcc-fr 0 0 0
@@ -142,6 +142,7 @@ gcc-g77 15 0 67
gcc-objc 16 0 75
gcc-java 16 0 75
gcc-chill 20 0 65
+gcc-colorgcc 10 0 84
gd 12 0 71
gdb 12 0 94
gdbm 12 0 72
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 8877501b5..753d61603 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -11,7 +11,7 @@ local $_ = join '', @ARGV;
/-h/ and die "usage: draksec [--expert]\n";
-$::expert = /--expert/;
+$::expert = /--expert/ || cat_("/etc/sysconfig/system") =~ /^TYPE=.*expert/;
$::isStandalone = 1;
my $in = vnew interactive('su');
diff --git a/tools/make_mdkinst_stage2 b/tools/make_mdkinst_stage2
index 724808dd7..192c3a881 100755
--- a/tools/make_mdkinst_stage2
+++ b/tools/make_mdkinst_stage2
@@ -24,7 +24,7 @@ $SUDO cp -a $DEST/* $STAGE2TMP
mkdir -p $MNTPOINT 2>/dev/null
for i in $MNTPOINT $STAGE2; do $SUDO umount $i 2>/dev/null ; done
-dd if=/dev/zero of=$STAGE2 bs=1M count=15
+dd if=/dev/zero of=$STAGE2 bs=1M count=16
$MKE2FS -N 1000 $STAGE2
$SUDO mount -t ext2 $STAGE2 $MNTPOINT -o loop