summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-28 12:56:26 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-28 12:56:26 +0000
commit5fd046ac65b74d9b9b5c18bbb9579329f4036c49 (patch)
tree7787538c42e634c8e9935866048bfcfb282a7ef8
parentf902492a01c974283c9c800ddbd5de651c474c25 (diff)
downloaddrakx-5fd046ac65b74d9b9b5c18bbb9579329f4036c49.tar
drakx-5fd046ac65b74d9b9b5c18bbb9579329f4036c49.tar.gz
drakx-5fd046ac65b74d9b9b5c18bbb9579329f4036c49.tar.bz2
drakx-5fd046ac65b74d9b9b5c18bbb9579329f4036c49.tar.xz
drakx-5fd046ac65b74d9b9b5c18bbb9579329f4036c49.zip
no_comment
-rw-r--r--Makefile8
-rw-r--r--docs/TODO2
-rwxr-xr-xmake_boot_img6
-rwxr-xr-xperl-install/g_auto_install4
-rw-r--r--perl-install/interactive.pm10
-rw-r--r--perl-install/interactive_gtk.pm11
-rwxr-xr-xupdate_kernel4
7 files changed, 27 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index fd56f624a..bab8858e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
BOOT_IMG = gi_hd.img gi_cdrom.img gi_network.img gi_network_ks.img gi_pcmcia.img
BINS = install/install install/local-install install/installinit/init
-
+DIRS = install mouseconfig perl-install ddcprobe
.PHONY: $(BOOT_IMG) $(FLOPPY_IMG) $(BINS) update_kernel
@@ -10,7 +10,10 @@ all: $(BOOT_IMG)
cp -f $(BOOT_IMG) /export/images
clean:
- rm -rf $(BOOT_IMG) $(BINS) modules vmlinuz System.map
+ rm -rf $(BOOT_IMG) $(BINS) modules install_pcmcia_modules vmlinuz System.map
+ rm -rf install/*/sbin/install install/*/sbin/init
+ for i in $(DIRS); do make -C $$i clean; done
+ find . -name "*~" -o -name ".#*" | xargs rm -f
$(BOOT_IMG): $(BINS)
if [ ! -e modules ]; then $(MAKE) update_kernel; fi
@@ -21,6 +24,7 @@ $(BINS):
update_kernel:
+ cd install ; ln -sf ../kernel/cardmgr/* .
./update_kernel
$(BOOT_IMG:%=%f): %f: %
diff --git a/docs/TODO b/docs/TODO
index 6261f3851..04d81ce51 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -76,6 +76,8 @@ test smp (is it enough to scan /proc/cpuinfo for multiple /^processor/ lines?)
remove the nasty wrapping arrow (in help) by patching gtk :(
+in ask_from_list, the horizontal scroll is buggy
+
use ddcprobe monitor's size info for pnp monitors
use ddcprobe video card memory size info
use ddcprobe modelines to reduce the available resolutions
diff --git a/make_boot_img b/make_boot_img
index 09b1b9222..ea4533faf 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -39,9 +39,9 @@ sub initrd {
__ "$sudo umount $tmp $mnt 2>/dev/null";
_ "dd if=/dev/zero of=$tmp bs=1k count=2000";
_ "echo y | mke2fs $tmp";
- _ "$sudo mount $tmp $mnt -o loop";
+ _ "$sudo mount -t ext2 $tmp $mnt -o loop";
_ "$sudo cp -a $instdir/$inst1/* $mnt";
- _ "sudo cp -f install_${type}_modules/* $mnt/modules/" if -d "install_${type}_modules";
+ _ "$sudo cp -f install_${type}_modules/* $mnt/modules/" if -d "install_${type}_modules";
_ "$sudo cp -f modules/${type}_modules.cgz $mnt/modules/modules.cgz";
_ "$sudo cp -f modules/modules.dep $mnt/modules/";
_ "$sudo umount $mnt";
@@ -54,7 +54,7 @@ sub boot_img {
__ "$sudo umount $mnt 2>/dev/null";
_ "bunzip2 -c $instdir/installinit/emptyboot.img.bz2 > $img";
- _ "$sudo mount -o umask=0 $img $mnt -o loop";
+ _ "$sudo mount -t msdos -o umask=0 $img $mnt -o loop";
_ "cat vmlinuz > $mnt/vmlinuz";
initrd("${mnt}2", "$mnt/$type.rdz");
diff --git a/perl-install/g_auto_install b/perl-install/g_auto_install
index 41a5d3303..cb5ed3cc7 100755
--- a/perl-install/g_auto_install
+++ b/perl-install/g_auto_install
@@ -1,7 +1,5 @@
#!../perl
-@ARGV == 0 or die "usage: $0\n";
-
my $dir = `pwd`;
chomp $dir;
$dir .= "/../../..";
@@ -10,4 +8,4 @@ $ENV{PERL5LIB} = join ":", map { "$dir/$_" } @INC;
$ENV{LD_LIBRARY_PATH} = "$dir/usr/lib";
$ENV{PATH} = join ":", map { "$dir/$_" } split ":", "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin";
-exec "../perl", "./install2", "--g_auto_install" or die;
+exec "../perl", "./install2", "--g_auto_install", @ARGV or die;
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 2a18767e4..a6a8a1341 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -154,15 +154,7 @@ sub wait_message($$$) {
$b;
}
-sub kill {
- my ($o) = @_;
- $o->{before_killing} ||= 0;
- while (@interactive::objects > $o->{before_killing}) {
- my $w = pop @interactive::objects;
- $w->destroy;
- }
- $o->{before_killing} = @interactive::objects;
-}
+sub kill {}
#-######################################################################################
#- Wonderful perl :(
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index f730cc2e6..95c668378 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -222,3 +222,14 @@ sub wait_message_endW {
my ($o, $w) = @_;
$w->destroy;
}
+
+sub kill {
+ my ($o) = @_;
+ $o->{before_killing} ||= 0;
+ while (@interactive::objects > $o->{before_killing}) {
+ my $w = pop @interactive::objects;
+ $w->destroy;
+ }
+ @my_gtk::grabbed = ();
+ $o->{before_killing} = @interactive::objects;
+}
diff --git a/update_kernel b/update_kernel
index 9a339f688..5ef12ae01 100755
--- a/update_kernel
+++ b/update_kernel
@@ -1,6 +1,6 @@
#!/bin/bash
-KERNEL_BOOT_PATH="kernel-2.2.13BOOTchou5"
+KERNEL_BOOT_PATH="kernel"
SCSI_DRIVERS="
53c7,8xx.o AM53C974.o BusLogic.o NCR53c406a.o advansys.o aha152x.o
@@ -54,6 +54,7 @@ PCMCIA_MODULES="$PCMCIA_DRIVERS $MISCMODULES $FSMODULES"
PCMCIA_INSTALLMODULES="pcmcia_core.o tcic.o ds.o i82365.o"
+PRISTINE_MODULES="serial.o"
cp -f "$KERNEL_BOOT_PATH"/boot/vmlinuz* vmlinuz
cp -f "$KERNEL_BOOT_PATH"/boot/System.map* System.map
@@ -64,6 +65,7 @@ cp -f "$KERNEL_BOOT_PATH"/boot/System.map* System.map
rm -rf modules ; install -d modules
(cd modules ;
cp -f `find ../"$KERNEL_BOOT_PATH"/lib/modules/ -name "*.o"` .
+ mkdir pristine ; cp $PRISTINE_MODULES pristine
/sbin/depmod -m ../System.map -i -e *.o | grep ': ' | sed 's/\.o//g' > modules.dep
ls *.o | cpio --quiet -H crc -o | bzip2 -9> modules.cpio.bz2
ls $NETWORK_MODULES | cpio --quiet -H crc -o | gzip -9 > network_modules.cgz