#!/usr/bin/perl @ARGV == 3 or die "Usage: $0 filename.img imagetype path_to_mar_bin\n ex. $0 cdrom-changedisk.img cdrom\n\nPut the old images (*.img), new vmlinuz, new modules.dep and new *.mar files in a fresh directory, and update each image file one by one."; $file = $ARGV[0]; $img = $ARGV[1]; $marbin = $ARGV[2]; sub __ { print @_, "\n"; system(@_); } sub _ { __ @_; $? and die; } $topdir = '/tmp/updimg'; print "Updating boot image file $file of type $img\n"; _ "rm -rf $topdir"; _ "mkdir $topdir"; _ "mkdir $topdir/img"; _ "mount -o loop $file $topdir/img"; $rdz = glob("$topdir/img/*.rdz"); $rdz or die "Could not glob rdz file in $topdir/img/*.rdz\n"; _ "zcat $rdz > /tmp/meuh"; _ "mkdir $topdir/initrd"; _ "mount -o loop /tmp/meuh $topdir/initrd"; print "\n\tOld sizes:\n"; print `ls -l $topdir/img/vmlinuz`; print `ls -l $topdir/initrd/modules/modules.mar`; system("df $topdir/img"); print "\n"; _ "cp -f vmlinuz $topdir/img/vmlinuz"; system("$marbin -l $topdir/initrd/modules/modules.mar | sort > $topdir/oldmar"); system("$marbin -l ${img}_modules.mar | sort > $topdir/newmar"); _ "cp -f ${img}_modules.mar $topdir/initrd/modules/modules.mar"; _ "cp -f modules.dep $topdir/initrd/modules/modules.dep"; _ "umount $topdir/initrd"; _ "gzip -c /tmp/meuh > $rdz"; print "\n\tNew sizes:\n"; print `ls -l vmlinuz`; print `ls -l ${img}_modules.mar`; system("df $topdir/img"); print "\nDiff from old to new marfiles:\n"; print `diff -u $topdir/oldmar $topdir/newmar`; print "\n"; _ "umount $topdir/img"; o/mga2'>distro/mga2 Mageia Installer and base platform for many utilitiesThierry Vignaud [tv]
summaryrefslogtreecommitdiffstats
path: root/perl-install/network/netconnect.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-05-04 03:32:05 +0000
committerOlivier Blin <oblin@mandriva.org>2005-05-04 03:32:05 +0000
commit748e6a2debd25a02a8987b73d2431756cd738f6a (patch)
treeb875d939872d7005571f2cb275544cef1aa5b8d1 /perl-install/network/netconnect.pm
parentc8736acf406d4fcd48f405847038c27b8a5f0497 (diff)
downloaddrakx-748e6a2debd25a02a8987b73d2431756cd738f6a.tar
drakx-748e6a2debd25a02a8987b73d2431756cd738f6a.tar.gz
drakx-748e6a2debd25a02a8987b73d2431756cd738f6a.tar.bz2
drakx-748e6a2debd25a02a8987b73d2431756cd738f6a.tar.xz
drakx-748e6a2debd25a02a8987b73d2431756cd738f6a.zip
remove useless warning in install, we never override configuration (#10827)
Diffstat (limited to 'perl-install/network/netconnect.pm')
-rw-r--r--perl-install/network/netconnect.pm15
1 files changed, 1 insertions, 14 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 3d910deee..bf06faf2b 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -1022,23 +1022,10 @@ You can find a driver on http://eciadsl.flashtux.org/"),
return $ndiswrapper_next_step->();
}
$ethntf = $intf->{$ntf_name} ||= { DEVICE => $ntf_name };
- $::isInstall && $netc->{NET_DEVICE} eq $ethntf->{DEVICE} ? 'lan_alrd_cfg' : 'lan_protocol';
+ 'lan_protocol';
},
},
- lan_alrd_cfg =>
- {
- name => N("WARNING: this device has been previously configured to connect to the Internet.
-Modifying the fields below will override this configuration.
-Do you really want to reconfigure this device?"),
- type => "yesorno",
- default => "no",
- post => sub {
- my ($res) = @_;
- return $res ? "lan_protocol" : "alrd_end";
- }
- },
-
alrd_end =>
{