Remove no longer used functions. These are obsoleted by the busybox

approach.


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

1 files changed, 0 insertions, 215 deletions

diff --git a/installer/slxossetup b/installer/slxossetup
index c60841e5..89d06974 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -405,221 +405,6 @@ function slxossetup_busybox()
 	install_slxselection
 }
 
-function install_prereq_packages()
-{
-	test "${SLX_BASE_PREREQ_PACKAGES}" || \
-		return
-
-	# Download and unpack prerequired packages before any package installation
-	SLX_PACKAGE_PATH="${SLX_METADATA_PATH}/packages"
-	TMP_DIR=$( mktemp -d "${SLX_METADATA_PATH}/packages.XXXXXXXX")
-	if test $? -ne 0; then
-		echo "$0: Warning, can not create temp package download directory! "
-		echo "    Using ${SLX_PACKAGE_DOWNLOAD_PATH} instead. "
-		SLX_PACKAGE_DOWNLOAD_PATH="${SLX_PACKAGE_PATH}"
-	else
-		SLX_PACKAGE_DOWNLOAD_PATH="${TMP_DIR}"
-	fi
-	test -d "${SLX_PACKAGE_DOWNLOAD_PATH}" || \
-		mkdir -p "${SLX_PACKAGE_DOWNLOAD_PATH}"
-	pushd "${SLX_PACKAGE_DOWNLOAD_PATH}" >/dev/null
-	smart --data-dir="${SLX_METADATA_PATH}" \
-		download \
-		${SLX_BASE_PREREQ_PACKAGES}
-
-	unset packagelist
-	for package in ${SLX_BASE_PREREQ_PACKAGES}; do
-		packagelist="${packagelist} $( ls ${package}*)"
-	done
-	popd >/dev/null
-
-	ARCHIVES_PATH="${SLX_METADATA_PATH}/deb-archives"
-	BOOTSTRAP_PATH="${SLX_METADATA_PATH}/debootstrap"
-	test -d "${SLX_STAGE1_PATH}" || \
-		mkdir -p "${SLX_STAGE1_PATH}"
-	for package in ${packagelist}; do
-		package="${SLX_PACKAGE_DOWNLOAD_PATH}/${package}"
-		case "${package}" in
-			*.deb)
-				test -d "${ARCHIVES_PATH}" || \
-					mkdir -p "${ARCHIVES_PATH}"
-				test -d "${BOOTSTRAP_PATH}" || \
-					mkdir -p "${BOOTSTRAP_PATH}"
-				pushd "${ARCHIVES_PATH}" >/dev/null
-				ar x "${package}"
-				popd >/dev/null
-				pushd "${BOOTSTRAP_PATH}" >/dev/null
-				tar xfz "${ARCHIVES_PATH}/data.tar.gz"
-				popd >/dev/null
-				rm -rf "${ARCHIVES_PATH}"
-				;;
-			*.rpm)
-				pushd "${SLX_STAGE1_PATH}" >/dev/null
-				rpm2cpio "${package}" | \
-					cpio -i --make-directories
-				popd >/dev/null
-				;;
-			*)
-				echo "$0: Warning, unknown package type of ${package}. "
-				;;
-		esac
-	done
-
-	# Ckech if we have to bootstrap
-	if test "${BOOTSTRAP_PATH}" -a -x "${BOOTSTRAP_PATH}/usr/sbin/debootstrap"; then
-		DEBOOTSTRAP_DIR="${BOOTSTRAP_PATH}/usr/lib/debootstrap" \
-			"${BOOTSTRAP_PATH}/usr/sbin/debootstrap" \
-			${SLX_INST_ARCH:+--arch $SLX_INST_ARCH} \
-			"${SLX_INST_SOURCE_DISTRIBUTION}" \
-			"${SLX_STAGE1_PATH}" \
-			"${SLX_INST_SOURCE_BASEURL}"
-		rm -rf "${BOOTSTRAP_PATH}"
-	fi
-
-	# Move package from temp to package dir.
-	if test "${SLX_PACKAGE_DOWNLOAD_PATH}" != "${SLX_PACKAGE_PATH}"; then
-		test -d "${SLX_PACKAGE_PATH}" || \
-			mkdir -p "${SLX_PACKAGE_PATH}"
-		pushd "${SLX_PACKAGE_DOWNLOAD_PATH}" >/dev/null
-		for package in *.deb *.rpm; do
-			test -f ${package} || \
-				continue
-			mv ${package} "${SLX_PACKAGE_PATH}"
-		done
-		popd >/dev/null
-		rmdir "${SLX_PACKAGE_DOWNLOAD_PATH}"
-	fi
-
-	# Cleanup etc to prevent .rpnnew files
-	if test "${SLX_BASE_PREREQ_CLEANUP_PATH}"; then
-		for path in ${SLX_BASE_PREREQ_CLEANUP_PATH}; do
-			find "${SLX_STAGE1_PATH}/${path}" -type f -print0 | \
-				xargs -0 rm -f
-		done
-	fi
-}
-
-function slxossetup_smart()
-{
-	for dir in ${SLX_METADATA_PATH} ${SLX_STAGE1_PATH}; do
-		if test -d "${dir}"; then
-			echo "$0: Error, ${dir} already exists! "
-			exit 1
-		fi
-	done
-
-	smart --data-dir="${SLX_METADATA_PATH}" \
-		config \
-		--set \
-		"${NAME_DEST_ROOT}"="${SLX_STAGE1_PATH}"
-
-	for variable in ${!SLX_INST_SOURCE_NAME_*}; do
-		# Unset SMART_* to let smart fail if they are not set for a particular
-		# channel; unset PACKAGEKEYS to prevent adding them multiple times.
-		unset SMART_COMPONENTS \
-			SMART_DISTRIBUTION \
-			SMART_NAME \
-			SMART_PRIORITY \
-			SMART_TYPE \
-			PACKAGEKEYS
-
-		SMART_CHANNEL="${variable##*_}"
-		SMART_BASEURL=$( eval echo \$SLX_INST_SOURCE_BASEURL_${SMART_CHANNEL})
-		SMART_NAME=$( eval echo \$$variable)
-		test "${SMART_NAME}" || \
-			SMART_NAME="${SMART_CHANNEL}"
-
-		SMART_TYPE=$( eval echo \$SLX_INST_SOURCE_TYPE_${SMART_CHANNEL})
-		# Use default repo type if not available from settings config file
-		test "${SMART_TYPE}" || \
-			SMART_TYPE="${REPO_TYPE}"
-
-		# Has this config distribution, components
-		SMART_DISTRIBUTION=$( eval echo \$SLX_INST_SOURCE_DISTRIBUTION_${SMART_CHANNEL})
-		SMART_COMPONENTS=$( eval echo \$SLX_INST_SOURCE_COMPONENTS_${SMART_CHANNEL})
-		SMART_PRIORITY=$( eval echo \$SLX_INST_SOURCE_PRIORITY_${SMART_CHANNEL})
-		# Check if one of our global settings is still undefined
-		for setting in ${GLOBAL_SETTINGS}; do
-			test "$( eval echo \$SMART_${setting})" || \
-				eval SMART_${setting}=\$SLX_INST_SOURCE_${setting}
-		done
-
-		# Prefix the config name for optional parameters
-		test "${SMART_DISTRIBUTION}" && \
-		SMART_DISTRIBUTION="distribution=\"${SMART_DISTRIBUTION}\""
-		test "${SMART_COMPONENTS}" && \
-			SMART_COMPONENTS="components=\"${SMART_COMPONENTS}\""
-		test "${SMART_PRIORITY}" && \
-			SMART_PRIORITY="priority=\"${SMART_PRIORITY}\""
-
-		PACKAGEKEYS=$( eval echo \$SLX_INST_SOURCE_PACKAGEKEYS_${SMART_CHANNEL})
-
-		eval smart --data-dir=\"${SLX_METADATA_PATH}\" \
-			channel \
-			--add \"${SMART_CHANNEL}\" \
-			name=\"${SMART_NAME}\" \
-			type=\"${SMART_TYPE}\" \
-			baseurl=\"${SMART_BASEURL}\" \
-			${SMART_DISTRIBUTION} \
-			${SMART_COMPONENTS} \
-			${SMART_PRIORITY} \
-			-y
-
-		for packagekey in ${PACKAGEKEYS}; do
-			case "${packagekey}" in
-				*/*) ;;
-				*) packagekey="${SMART_BASEURL}/${packagekey}" ;;
-			esac
-			rpm --root="${SLX_STAGE1_PATH}" \
-				--import "${packagekey}"
-		done
-	done
-
-	for path in ${SLX_STAGE1_CREATE_DIR}; do
-		mkdir -p "${SLX_STAGE1_PATH}/${path}"
-	done
-	for file in ${SLX_STAGE1_CREATE_FILE}; do
-		touch "${SLX_STAGE1_PATH}/${file}"
-	done
-
-	smart --data-dir="${SLX_METADATA_PATH}" \
-		update
-
-	install_prereq_packages
-
-	install_prereq_file
-
-	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)"
-	done
-
-	smart --data-dir="${SLX_METADATA_PATH}" \
-		install \
-		${packagelist} \
-		-y
-
-	# Move any .rpmnew file to the right name
-	for file in $( find "${SLX_STAGE1_PATH}" -type f -name '*.rpmnew'); do
-		mv "${file}" "${file%.rpmnew}"
-	done
-
-	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_init()
 {
 	SLX_METADATA_PATH="${SLX_PRIVATE_PATH}/metadata/${SLX_SYSTEM_NAME}"