---
scripts/scrubtree | 2 +-
scripts/upd-instroot | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/scrubtree b/scripts/scrubtree
index 6b604b0..6866937 100755
--- a/scripts/scrubtree
+++ b/scripts/scrubtree
@@ -45,7 +45,7 @@ rm $p/etc/ld.so.conf
#
# HOWEVER dont clobber existing programs supplied by other packages if exist
#
-mv $p/usr/sbin/busybox.anaconda $p/usr/bin/busybox
+mv $p/usr/sbin/busybox $p/usr/bin/busybox
(cd $p/usr/bin;
set $(./busybox 2>&1| awk '/^ ([[:alnum:]_.[]+,)+/' | sed 's/,//g' | sed 's/ +//');
dontclobber=(sh busybox reboot shutdown poweroff)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 6541ec0..37e13fd 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -110,7 +110,7 @@ PACKAGES="glibc glibc-common setup openssl python python-libs newt slang libseli
procps rpm rpm-libs XFree86 Xconfigurator anaconda tzdata
anaconda-runtime kudzu hwdata bzip2 beecrypt mdadm libsemanage
bzip2-libs dosfstools pciutils reiserfs-utils parted sed
- busybox-anaconda rpm-python booty hdparm lvm2 beecrypt device-mapper
+ busybox rpm-python booty hdparm lvm2 beecrypt device-mapper
rhpl pyxf86config libxml2 libxml2-python glib2 sqlite neon
elfutils-libelf krb5-libs convertdb1 jfsutils audit-libs pam
xfsprogs xfsdump dmapi libacl libattr attr acl python-urlgrabber
@@ -335,7 +335,7 @@ sbin/kpartx.static
sbin/mpath_prio_*.static
lib/udev/scsi_id
sbin/badblocks
-sbin/busybox.anaconda
+sbin/busybox
sbin/clock
sbin/cryptsetup
sbin/debugfs
@@ -551,7 +551,7 @@ usr/sbin/in.telnetd
usr/sbin/xinetd
sbin/cmsfslst
sbin/cmsfscat
-sbin/busybox.anaconda
+sbin/busybox
sbin/ifconfig
sbin/route
sbin/portmap
--
1.7.3.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

> scripts/scrubtree | 2 +-
> scripts/upd-instroot | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)

What does this do to the size of the initrd, and is that therefore going
to cause problems for ppc?

- Chris

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

On Tue, 2011-05-10 at 09:20 -0400, Chris Lumens wrote:
> > scripts/scrubtree | 2 +-
> > scripts/upd-instroot | 6 +++---
> > 2 files changed, 4 insertions(+), 4 deletions(-)
>
> What does this do to the size of the initrd, and is that therefore going
> to cause problems for ppc?
>
> - Chris

gzipped busybox has 1.2MB so I suppose initrd will be 1.2MB bigger

>
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list@redhat.com
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list

--
Martin Gracik <mgracik@redhat.com>

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

On Tue, 2011-05-10 at 16:28 +0200, Martin Gracik wrote:
> On Tue, 2011-05-10 at 09:20 -0400, Chris Lumens wrote:
> > > scripts/scrubtree | 2 +-
> > > scripts/upd-instroot | 6 +++---
> > > 2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > What does this do to the size of the initrd, and is that therefore going
> > to cause problems for ppc?
> >
> > - Chris
>
> gzipped busybox has 1.2MB so I suppose initrd will be 1.2MB bigger

well, it's relative, the busybox.anaconda gzipped has 600KB, so there's
a 600KB difference, not 1.2MB, and this is not counting all the
libraries we need to put to the initrd, if we want to use the
dynamically linked busybox, which could take up the remaining 600KB
difference, so at the end the size may be the same.

>
> >
> > _______________________________________________
> > Anaconda-devel-list mailing list
> > Anaconda-devel-list@redhat.com
> > https://www.redhat.com/mailman/listinfo/anaconda-devel-list
>

--
Martin Gracik <mgracik@redhat.com>

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

On Tue, 2011-05-10 at 16:28 +0200, Martin Gracik wrote:
> On Tue, 2011-05-10 at 09:20 -0400, Chris Lumens wrote:
> > > scripts/scrubtree | 2 +-
> > > scripts/upd-instroot | 6 +++---
> > > 2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > What does this do to the size of the initrd, and is that therefore going
> > to cause problems for ppc?
> >
> > - Chris
>
> gzipped busybox has 1.2MB so I suppose initrd will be 1.2MB bigger

well, it's relative, the busybox.anaconda gzipped has 600KB, so there's
a 600KB difference, not 1.2MB, and this is not counting all the
libraries we need to put to the initrd, if we want to use the
dynamically linked busybox, which could take up the remaining 600KB
difference, so at the end the size may be the same.

>
> >
> > _______________________________________________
> > Anaconda-devel-list mailing list
> > Anaconda-devel-list@redhat.com
> > https://www.redhat.com/mailman/listinfo/anaconda-devel-list
>

--
Martin Gracik <mgracik@redhat.com>

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

> well, it's relative, the busybox.anaconda gzipped has 600KB, so there's
> a 600KB difference, not 1.2MB, and this is not counting all the
> libraries we need to put to the initrd, if we want to use the
> dynamically linked busybox, which could take up the remaining 600KB
> difference, so at the end the size may be the same.

Sounds good to me.

- Chris

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list