summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-07-21 15:08:43 -0400
committerChris Lumens <clumens@redhat.com>2009-07-21 16:27:59 -0400
commitf12965a2b2f7bcaba08e0662af14c8f7551e5ec5 (patch)
tree8cb0b57dca44a945ff52f8a9c5318886e6f4e8f6 /scripts
parent8fc46a274b12a2a937698de5158a1671f7f65c7a (diff)
downloadanaconda-f12965a2b2f7bcaba08e0662af14c8f7551e5ec5.tar.gz
anaconda-f12965a2b2f7bcaba08e0662af14c8f7551e5ec5.tar.xz
anaconda-f12965a2b2f7bcaba08e0662af14c8f7551e5ec5.zip
Add a bunch more stuff to the initrd needed for networking.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mk-images12
-rwxr-xr-xscripts/upd-instroot4
2 files changed, 14 insertions, 2 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index eb31027db..f746a290c 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -569,7 +569,6 @@ makeinitrd() {
ln -s /tmp $MBD_DIR/var/state/xkb
cp $IMGPATH/usr/bin/xauth $MBD_DIR/sbin/xauth
cp $IMGPATH/usr/sbin/cmsfs* $MBD_DIR/sbin/
- cp $IMGPATH/usr/bin/ipcalc $MBD_DIR/sbin/ipcalc
fi
if [ -n "$INITRDMODULES" ]; then
@@ -647,6 +646,10 @@ makeinitrd() {
instbin $IMGPATH /usr/sbin/arping $MBD_DIR /sbin/arping
instbin $IMGPATH /usr/sbin/ifconfig $MBD_DIR /sbin/ifconfig
instbin $IMGPATH /usr/sbin/ip $MBD_DIR /sbin/ip
+ instbin $IMGPATH /usr/bin/ipcalc $MBD_DIR /sbin/ipcalc
+ instbin $IMGPATH /usr/bin/hostname $MBD_DIR /sbin/hostname
+ instbin $IMGPATH /usr/sbin/ethtool $MBD_DIR /sbin/ethtool
+ instbin $IMGPATH /usr/sbin/route $MBD_DIR /sbin/route
touch $MBD_DIR/etc/resolv.conf
# hwdata
@@ -718,12 +721,19 @@ makeinitrd() {
)
# Misc
+ instbin $IMGPATH /usr/bin/awk $MBD_DIR /sbin/awk
+ instbin $IMGPATH /usr/bin/egrep $MBD_DIR /sbin/egrep
+ instbin $IMGPATH /usr/bin/fgrep $MBD_DIR /sbin/fgrep
+ instbin $IMGPATH /usr/bin/gawk $MBD_DIR /sbin/gawk
+ instbin $IMGPATH /usr/bin/grep $MBD_DIR /sbin/grep
+ instbin $IMGPATH /usr/bin/kill $MBD_DIR /sbin/kill
instbin $IMGPATH /usr/bin/ln $MBD_DIR /sbin/ln
instbin $IMGPATH /usr/bin/readlink $MBD_DIR /sbin/readlink
instbin $IMGPATH /usr/bin/rm $MBD_DIR /sbin/rm
instbin $IMGPATH /usr/bin/rmdir $MBD_DIR /sbin/rmdir
instbin $IMGPATH /usr/bin/sed $MBD_DIR /sbin/sed
instbin $IMGPATH /usr/bin/sleep $MBD_DIR /sbin/sleep
+ instbin $IMGPATH /usr/bin/touch $MBD_DIR /sbin/touch
# Indirect dependencies
install -m 755 $IMGPATH/$LIBDIR/libfreebl3.so $MBD_DIR/$LIBDIR/
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 4aef636ff..c666d53b1 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -157,7 +157,7 @@ PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit acl anaconda
cryptsetup-luks db4 dbus dbus-python dejavu-sans-fonts
dejavu-sans-mono-fonts device-mapper
device-mapper-libs dhclient dhcpv6-client dmapi dmraid dmraid-libs
- dogtail dosfstools e2fsprogs e2fsprogs-libs echo-icon-theme
+ dogtail dosfstools e2fsprogs e2fsprogs-libs echo-icon-theme ethtool
elfutils-libelf expat firstboot fontconfig fonts-ISO8859-2 freetype gail gawk gdb-gdbserver
gdk-pixbuf gfs2-utils glib2 glibc-common gnome-python2-canvas gnome-python2-gconf
gnome-python2-gtkhtml2 gnome-themes gpm grep gtk2 gtk2-engines gtkhtml2 hal
@@ -306,6 +306,7 @@ bin/false
bin/fdisk*
bin/gawk
bin/*grep
+bin/hostname
bin/kill
bin/ln
bin/ls
@@ -388,6 +389,7 @@ sbin/dumpe2fs
sbin/fsadm
sbin/e2fsck
sbin/e2label
+sbin/ethtool
sbin/fdisk
sbin/fsck
sbin/fsck.ext*