Add SLX_INSTALL_BIND_MOUNT and SLX_INSTALL_FAKE_FILE to make the Fedora

kernel RPM happy while installation.

For Fedora we mount -o bind /sys into the stage1 chroot.

We touch /etc/fstab which is enumerated in SLX_INSTALL_FAKE_FILE.


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@554 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 24 insertions, 0 deletions

diff --git a/installer/slxossetup b/installer/slxossetup
index c422c197..69e7cf0b 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -147,6 +147,19 @@ function slxossetup_rpm()
 		chown root: "${SLX_STAGE1_PATH}/${dest_file}"
 	done
 
+	for file in ${SLX_INSTALL_FAKE_FILE}; do
+		dir="${file%/*}"
+		test -d "${SLX_STAGE1_PATH}/${dir}" || \
+			mkdir -p "${SLX_STAGE1_PATH}/${dir}"
+		touch "${SLX_STAGE1_PATH}/${file}"
+	done
+
+	for mountpoint in ${SLX_INSTALL_BIND_MOUNT}; do
+		test -d "${SLX_STAGE1_PATH}/${mountpoint}" || \
+			mkdir -p "${SLX_STAGE1_PATH}/${mountpoint}"
+		mount -o bind "/${mountpoint}" "${SLX_STAGE1_PATH}/${mountpoint}"
+	done
+
 	unset packagelist
 	for variable in ${!SLX_INSTALL_PACKAGES_*}; do
 		packagelist="${packagelist} $( eval echo \$$variable)"
@@ -156,6 +169,15 @@ function slxossetup_rpm()
 		install \
 		${packagelist} \
 		-y
+
+	for mountpoint in ${SLX_INSTALL_BIND_MOUNT}; do
+		umount "${SLX_STAGE1_PATH}/${mountpoint}"
+	done
+	
+	for file in ${SLX_INSTALL_FAKE_FILE}; do
+		test -s "${SLX_STAGE1_PATH}/${file}" || \
+			rm -f "${SLX_STAGE1_PATH}/${file}"
+	done
 }
 
 function slxossetup()
diff --git a/installer/systems/fedora6/settings b/installer/systems/fedora6/settings
index db5b01f7..c0c574b6 100644
--- a/installer/systems/fedora6/settings
+++ b/installer/systems/fedora6/settings
@@ -16,4 +16,6 @@ SLX_INST_SOURCE_TYPE_fedora6="rpm-md"
 #SLX_INST_SOURCE_TYPE_fedora6update="rpm-md"
 SLX_BASE_PREREQ_PACKAGES="glibc"
 SLX_BASE_PREREQ_CLEANUP_PATH="etc/localtime etc/nsswitch.conf etc/rpc usr/lib/gconv/gconv-modules"
+SLX_INSTALL_BIND_MOUNT="sys"
+SLX_INSTALL_FAKE_FILE="/etc/fstab"
 SLX_INSTALL_PACKAGES_MAIN="kernel bash"