summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile4
-rw-r--r--perl-install/ChangeLog12
-rw-r--r--perl-install/fsedit.pm2
-rw-r--r--perl-install/install2.pm7
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/install_steps.pm3
-rw-r--r--perl-install/share/compssList26
-rw-r--r--rescue/tree/etc/profile2
8 files changed, 37 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index bcd9b5723..a20cfc6bd 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,8 @@ autoboot:
ifeq (i386,$(ARCH))
install -d $(ROOTDEST)/lnx4win
cp -f vmlinuz $(ROOTDEST)/lnx4win
- cp -f cdrom.rdz $(ROOTDEST)/lnx4win/initrd.img
+ cp -f cdrom.rdz $(ROOTDEST)/lnx4win/initrd.gz
+ /usr/sbin/rdev -v $(ROOTDEST)/lnx4win/vmlinuz 788
install -d $(AUTOBOOT)
cp -f vmlinuz $(AUTOBOOT)
@@ -58,6 +59,7 @@ ifeq (i386,$(ARCH))
cp -f cdrom.rdz $(AUTOBOOT)/initrd.cd
cp -f pcmcia.rdz $(AUTOBOOT)/initrd.pc
cp -f network.rdz $(AUTOBOOT)/initrd.nt
+ /usr/sbin/rdev -v $(AUTOBOOT)/vmlinuz 788
endif
dirs:
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 839a89af3..52169605a 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,15 @@
+2000-05-08 Pixel <pixel@mandrakesoft.com>
+
+ * install2.pm (main): move the touch of some files here to please linuxconf
+
+ * install2.pm (miscellaneous): s/KBD/KEYBOARD/
+
+ * lilo.pm (install_grub): don't keep symlinks for reiserfs
+ * lilo.pm (suggest): allow grub everytime now (not only if !reiserfs)
+
+ * install_any.pm (getHds): default mount point for windobe in
+ lowercased for StartOffice(!)
+
2000-05-08 Pablo Saratxaga <pablo@mandrakesoft.com>
* share/keyboards.tar.bz2: Fixed Brazilian keyboard (.br); added
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index f66a3488b..30b605927 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -168,7 +168,7 @@ sub computeSize($$$$) {
}
} @l;
}
- my $size = min($max, $best->{size} + $free_space * ($tot_ratios && $best->{ratio} / $tot_ratios));
+ my $size = int min($max, $best->{size} + $free_space * ($tot_ratios && $best->{ratio} / $tot_ratios));
#- verify other entry can fill the hole
if (grep { $_->{size} < $max - $size } @L) { $size } else { $max }
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index dadeac3d6..53ff1412b 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -388,7 +388,7 @@ sub miscellaneous {
my $f = "$o->{prefix}/etc/sysconfig/usb";
my %usb = getVarsFromSh($f);
$usb{MOUSE} = bool2yesno($o->{mouse}{device} eq "usbmouse");
- $usb{KBD} = bool2yesno(int grep { /^keybdev\.c: Adding keyboard/ } detect_devices::syslog());
+ $usb{KEYBOARD} = bool2yesno(int grep { /^keybdev\.c: Adding keyboard/ } detect_devices::syslog());
$usb{ZIP} = bool2yesno(-d "/proc/scsi/usb");
setVarsInSh($f, \%usb);
@@ -696,6 +696,11 @@ sub main {
fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab}, $o->{useSupermount});
modules::write_conf("$o->{prefix}/etc/conf.modules");
+ #- to ensure linuxconf doesn't cry against those files being in the future
+ foreach ('/etc/conf.modules', '/etc/crontab', '/etc/sysconfig/mouse', '/etc/X11/fs/config') {
+ my $now = time - 24 * 60 * 60;
+ utime $now, $now, "$o->{prefix}/$_";
+ }
install_any::killCardServices();
#- make sure failed upgrade will not hurt too much.
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 22d5c1c2d..89205de2a 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -357,7 +357,7 @@ Continue at your own risk!")) if !$ok2 && $ok && !$o->{partitioning}{readonly};
} else {
my %w; foreach (@win) {
my $v = $w{$_->{device_windobe}}++;
- $_->{mntpoint} = "/mnt/win_$_->{device_windobe}" . ($v ? $v+1 : '');
+ $_->{mntpoint} = "/mnt/win_" . lc($_->{device_windobe}) . ($v ? $v+1 : ''); #- lc cuz of StartOffice(!) cf dadou
}
}
$ok2;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index bd5de5b2f..f299af08d 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -423,9 +423,6 @@ GridHeight=70
} "$o->{prefix}$_/.kde/share/config/kfmrc"
}
- #- to ensure 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/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}) {
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 155c811be..e098e16ce 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -1,7 +1,7 @@
normal server developer
-AfterStep 55 0 53
-AfterStep-APPS 30 0 35
+AfterStep 22 0 53
+AfterStep-APPS 22 0 35
BasiliskII 35 0 10
BasiliskII-sheepnet 33 0 8
BitchX 43 0 15
@@ -51,7 +51,7 @@ SmallEiffel 0 0 30
SysVinit 15 52 45
TiMidity++ 51 0 54
WMRack 40 0 32
-WindowMaker 59 0 57
+WindowMaker 47 0 57
WindowMaker-devel 0 0 30
X11R6-contrib 55 0 47
XFree86-100dpi-fonts 56 0 30
@@ -151,7 +151,7 @@ bind-devel 0 0 0
bind-utils 25 35 70
binutils 47 0 87
bison 10 0 80
-blackbox 43 0 45
+blackbox 33 0 45
bladeenc 65 0 25
blt 10 0 75
bonnie 5 45 25
@@ -241,8 +241,8 @@ emacs-X11 51 0 69
emacs-el 0 0 15
emacs-leim 20 0 50
emacs-nox 20 0 14
-enlightenment 64 0 55
-enlightenment-conf 63 0 55
+enlightenment 41 0 55
+enlightenment-conf 41 0 55
enscript 20 25 71
eog 30 0 20
eperl 0 0 10
@@ -288,9 +288,9 @@ freetype-devel 10 0 0
fribidi 0 0 0
fribidi-devel 0 0 0
ftp 90 92 90
-fvwm 20 0 36
-fvwm2 23 0 36
-fvwm2-icons 23 0 36
+fvwm 12 0 15
+fvwm2 17 0 17
+fvwm2-icons 17 0 17
fwhois 25 45 36
g-print 65 0 58
gaddr 45 0 40
@@ -612,7 +612,7 @@ less 97 97 97
lesstif 0 0 0
lesstif-clients 0 0 0
lesstif-devel 0 0 0
-lesstif-mwm 0 0 0
+lesstif-mwm 2 0 2
lftp 50 78 83
lha 40 25 72
libPropList 10 0 80
@@ -1149,8 +1149,8 @@ webmin 20 40 20
wget 65 75 53
which 1 25 25
wine 54 0 57
-wine-debug 35 0 56
-wmakerconf 58 0 57
+wine-debug 0 0 0
+wmakerconf 47 0 57
wmconfig 66 0 54
wmnet 24 0 21
words 47 85 42
@@ -1176,7 +1176,7 @@ xemacs-el 0 0 15
xemacs-extras 50 0 36
xemacs-info 54 0 42
xemacs-mule 0 0 0
-xfce 54 0 34
+xfce 19 0 34
xfig 59 0 53
xfishtank 51 0 45
xgammon 40 0 31
diff --git a/rescue/tree/etc/profile b/rescue/tree/etc/profile
index ffd2b3174..ce6db9cd7 100644
--- a/rescue/tree/etc/profile
+++ b/rescue/tree/etc/profile
@@ -6,7 +6,7 @@
PROFILE_LOADED=1
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH=/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:/mnt/disk/sbin:/mnt/disk/bin:/mnt/disk/usr/sbin:/mnt/disk/usr/bin:/mnt/disk/usr/X11R6/bin
PS1="[root@rescue]\\$ "
ls () { /bin/ls --color=auto -F "$@";}
generated by cgit v1.2.1 (git 2.21.0) at 2024-07-06 19:32:26 +0000