summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2008-01-22 16:53:54 -0500
committerChris Lumens <clumens@redhat.com>2008-02-11 10:43:55 -0500
commitb97a8e70331e71559e08a684195904c5cb824408 (patch)
treef426357032d1bb696ecd7dd78493bfbb0073c84d
parent2a216047589a34b49a871b851a4925d0cddcaae7 (diff)
downloadanaconda-b97a8e70331e71559e08a684195904c5cb824408.tar.gz
anaconda-b97a8e70331e71559e08a684195904c5cb824408.tar.xz
anaconda-b97a8e70331e71559e08a684195904c5cb824408.zip
Add the real mount programs to stage1.
-rwxr-xr-xscripts/mk-images5
-rwxr-xr-xscripts/upd-instroot7
2 files changed, 10 insertions, 2 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index 377d6cfc0..df5979aa1 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -536,6 +536,11 @@ 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
+ instbin $IMGPATH /bin/umount $MBD_DIR /bin/umount
+ ln -s mount.nfs $MBD_DIR/sbin/umount.nfs
+
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 664feaad8..464e839d3 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