[PATCH] Add the real mount programs to stage1.

[Chris Lumens <clumens redhat com>]

---
 scripts/mk-images    |    7 +++++++
 scripts/upd-instroot |    7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index fd7c340..cab5fb5 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -533,6 +533,13 @@ makeinitrd() {
     install -m 644 $IMGPATH/etc/group $MBD_DIR/etc/group
     install -m 644 $IMGPATH/etc/nsswitch.conf $MBD_DIR/etc/nsswitch.conf
 
+    instbin $IMGPATH /bin/mount $MBD_DIR /bin/mount
+    instbin $IMGPATH /sbin/mount.nfs $MBD_DIR /sbin/mount.nfs
+    ln -s mount.nfs $MBD_DIR/sbin/mount.nfs4
+    instbin $IMGPATH /bin/umount $MBD_DIR /bin/umount
+    ln -s mount.nfs $MBD_DIR/sbin/umount.nfs
+    ln -s mount.nfs $MBD_DIR/sbin/umount.nfs4
+
     instbin $IMGPATH /usr/sbin/udevd $MBD_DIR /sbin/udevd
     instbin $IMGPATH /usr/sbin/udevadm $MBD_DIR /sbin/udevadm
     ln -s udevadm $MBD_DIR/sbin/udevcontrol
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 664feaa..464e839 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -2,7 +2,7 @@
 #
 # upd-instroot
 #
-# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
+# Copyright (C) 2007, 2008 Red Hat, Inc.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -155,7 +155,7 @@ PACKAGES="glibc-common setup python newt slang libselinux
 	 python-elementtree pykickstart e2fsprogs-libs iscsi-initiator-utils
 	 db4 rhpxl xorg-x11-server-Xorg libuser-python libuser system-config-date
 	 yum-metadata-parser gfs2-utils libvolume_id nash yum-fedorakmod
-	 libdhcp libnl libdhcp6client libdhcp4client newt-python
+	 libdhcp libnl libdhcp6client libdhcp4client newt-python nfs-utils
 	 device-mapper device-mapper-libs dmraid keyutils-libs libsemanage-python
 	 python-pyblock mkinitrd libbdevid libbdevid-python nss nspr pcre
 	 cryptsetup-luks libgcrypt libgpg-error dbus dbus-python hal
@@ -304,6 +304,7 @@ bin/ash
 bin/dbus-daemon
 bin/fdisk*
 bin/sed
+bin/mount
 etc/dbus-1
 etc/group
 etc/hal
@@ -368,6 +369,7 @@ sbin/mkfs.vfat
 sbin/mkreiserfs
 sbin/mkraid
 sbin/mkswap
+sbin/mount.nfs*
 sbin/parted
 sbin/pcmcia-socket-startup
 sbin/pdisk
@@ -375,6 +377,7 @@ sbin/probe
 sbin/reiserfstune
 sbin/resize2fs
 sbin/tune2fs
+sbin/umount.nfs*
 sbin/xfsdump
 sbin/xfsrestore
 sbin/xfs_repair
-- 
1.5.3.7