diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | perl-install/ftp.pm | 14 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 |
3 files changed, 15 insertions, 9 deletions
@@ -1,9 +1,9 @@ ARCH := $(patsubst i%86,i386,$(shell uname -m)) ARCH := $(patsubst sparc%,sparc,$(ARCH)) -RELEASE_BOOT_IMG = cdrom.img hd.img hdreiser.img network.img +RELEASE_BOOT_IMG = cdrom.img hd.img hdreiser.img# network.img ifeq (i386,$(ARCH)) -RELEASE_BOOT_IMG += all.img blank.img other.img pcmcia.img +#RELEASE_BOOT_IMG += all.img blank.img other.img pcmcia.img endif ifeq (sparc,$(ARCH)) BOOT_IMG = live.img tftp.img tftprd.img live64.img tftp64.img tftprd64.img @@ -40,7 +40,7 @@ autoboot: ifeq (i386,$(ARCH)) install -d $(ROOTDEST)/boot # cp -f vmlinuz {hd,cdrom,pcmcia,network,all,other}.rdz $(ROOTDEST)/boot - cp -f vmlinuz {hd,hdreiser,cdrom,network,all,other}.rdz $(ROOTDEST)/boot + cp -f vmlinuz $(BOOT_RDZ) $(ROOTDEST)/boot /usr/sbin/rdev -v $(ROOTDEST)/boot/vmlinuz 788 endif @@ -77,7 +77,7 @@ clean: for i in $(DIRS) rescue; do make -C $$i clean; done find . -name "*~" -o -name ".#*" | xargs rm -f -upload: install #clean +upload: clean install function upload() { rsync -qSavz --verbose --exclude '*~' -e ssh --delete $(ROOTDEST)/$$1/$$2 mandrake@kenobi:/c/cooker/$$1; } ;\ upload Mandrake/mdkinst '' ;\ upload Mandrake/base compss* ;\ diff --git a/perl-install/ftp.pm b/perl-install/ftp.pm index 669ed4fcb..14ef68bf0 100644 --- a/perl-install/ftp.pm +++ b/perl-install/ftp.pm @@ -27,9 +27,12 @@ sub fromEnv() { sub new { my ($host, $prefix, $login, $password) = @_; + log::l("ftp::new"); my @l = do { if ($hosts{"$host$prefix"}) { + log::l("ftp::new 1"); @{$hosts{"$host$prefix"}}; } else { + log::l("ftp::new 2"); my %options = (Passive => 1, Timeout => 60, Port => 21); $options{Firewall} = $ENV{PROXY} if $ENV{PROXY}; $options{Port} = $ENV{PROXYPORT} if $ENV{PROXYPORT}; @@ -40,6 +43,7 @@ sub new { my $ftp; while (1) { + log::l("ftp::new 3"); $ftp = Net::FTP->new(network::resolv($host), %options) or die; $ftp && $ftp->login($login, $password) and last; @@ -58,10 +62,12 @@ sub new { sub getFile { my ($f, @para) = @_; - my ($ftp, $retr) = new(@para ? @para : fromEnv); - $$retr->close if $$retr; - $$retr = $ftp->retr($f) or do { rewindGetFile(); goto &getFile }; - $$retr ||= $ftp->retr($f); + foreach (1..2) { + my ($ftp, $retr) = new(@para ? @para : fromEnv); + $$retr->close if $$retr; + $$retr = $ftp->retr($f) and return $$retr; + rewindGetFile(); + } } #-sub closeFiles() { diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 9340739f2..a080cd337 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -423,7 +423,7 @@ Consoles 1,3,4,7 may also contain interesting information"; if ($o->{pcmcia}) { substInFile { s/.*(TaskBarShowAPMStatus).*/$1=1/ } "$o->{prefix}/usr/lib/X11/icewm/preferences"; - eval { commands::cp("$o->{prefix}/usr/share/applnk/System/kapm.kdelnk", + eval { commands::cp("$o->{prefix}/usr/share/applnk/System/kapm.kdelnk", "$o->{prefix}/etc/skel/Desktop/Autostart/kapm.kdelnk") }; } |