summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-12 13:08:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-12 13:08:15 +0000
commit4198931416edb98bae7a822b2490ffb99c6ff20f (patch)
tree6a71ee7a42afe7021e36dc66c64be136ac23004a
parente8a6ab3527cbb5a666fd830518cf4343aaf52f34 (diff)
downloaddrakx-4198931416edb98bae7a822b2490ffb99c6ff20f.tar
drakx-4198931416edb98bae7a822b2490ffb99c6ff20f.tar.gz
drakx-4198931416edb98bae7a822b2490ffb99c6ff20f.tar.bz2
drakx-4198931416edb98bae7a822b2490ffb99c6ff20f.tar.xz
drakx-4198931416edb98bae7a822b2490ffb99c6ff20f.zip
use all.rdz instead of network.rdz in tftp (network.rdz is deprecated)
-rwxr-xr-xkernel/update_kernel2
-rwxr-xr-xmake_boot_img2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/update_kernel b/kernel/update_kernel
index 6a5da3db4..f1a351689 100755
--- a/kernel/update_kernel
+++ b/kernel/update_kernel
@@ -106,7 +106,7 @@ if [ -n "$rpm" -a ! -e $ALL_KERNELS/$rpm ]; then
cd ../..
for dir in /tftpboot /var/lib/tftpboot; do
- rm -f $dir/{vmlinuz,network.rdz}
+ rm -f $dir/{vmlinuz,network.rdz,all.rdz}
done
fi
diff --git a/make_boot_img b/make_boot_img
index 7edbc7e0f..2feb98d32 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -93,7 +93,7 @@ if ($arch =~ /i.86/ && $img =~ /all/) {
if (my ($tftpboot) = grep { -e $_ } qw(/tftpboot /var/lib/tftpboot)) {
system("/bin/cp -f kernel/all.kernels/$main/boot/vmlinu* $tftpboot/vmlinuz 2>/dev/null");
- system("/bin/cp -f images/network.rdz-$main $tftpboot/network.rdz 2>/dev/null");
+ system("/bin/cp -f images/all.rdz-$main $tftpboot/all.rdz 2>/dev/null");
}
sub install_stripped { _ "strip $_[0]"; _ "$sudo install $_[0] $_[1]" }