summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-04-15 11:49:00 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-04-15 11:49:00 +0000
commit5473c25646427fc52d80765ed47ecaeca8364caf (patch)
treea80cd234ca5588af7a619bf427ec732f50339319
parent30db5b5924b0a854c233aad424107d56562a91e1 (diff)
downloaddrakx-backup-do-not-use-5473c25646427fc52d80765ed47ecaeca8364caf.tar
drakx-backup-do-not-use-5473c25646427fc52d80765ed47ecaeca8364caf.tar.gz
drakx-backup-do-not-use-5473c25646427fc52d80765ed47ecaeca8364caf.tar.bz2
drakx-backup-do-not-use-5473c25646427fc52d80765ed47ecaeca8364caf.tar.xz
drakx-backup-do-not-use-5473c25646427fc52d80765ed47ecaeca8364caf.zip
drop duplicated code including busybox
-rw-r--r--images/NEWS3
-rwxr-xr-ximages/make_boot_img5
2 files changed, 3 insertions, 5 deletions
diff --git a/images/NEWS b/images/NEWS
index b60e11f30..ffa26fc6d 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,6 @@
+- drop duplicated code including busybox, ka version is better than
+ the one of DEBUGSTAGE1
+
Version 1.40 - 14 April 2009, by Pascal Terjan
- handle firmware loading in stage2 too
diff --git a/images/make_boot_img b/images/make_boot_img
index d0d13309b..05823cd20 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -209,11 +209,6 @@ fi
my @funct = map { /functions:/ .. /^$/ ? do { s/\s//g; split /,/ } : () } `busybox`;
shift @funct;
symlink('busybox', $tmp_initrd . "/sbin/$_") foreach @funct;
- }
-
- if ($ENV{DEBUGSTAGE1}) {
- _ "cp -f /usr/bin/busybox $tmp_initrd/sbin";
- symlink "busybox", "$tmp_initrd/sbin/$_" foreach qw(cat chgrp chmod chown chroot chvt clear cp cut date dd df dirname dmesg du echo env false find free grep gunzip gzip halt head id init kill killall klogd linuxrc ln logger ls lsmod mkdir mknod mkswap more mount mv poweroff ps pwd reboot reset rm rmdir sed sleep sh sort swapoff swapon sync syslogd tail tar touch true tty umount uname uniq uptime wc which whoami xargs yes zcat);
}
if ($o_bootsplash_cfg) {