summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Müller2006-12-18 20:42:38 +0100
committerLars Müller2006-12-18 20:42:38 +0100
commit4d1c70557c6d23c8aa736396f49190de354b72ca (patch)
tree442575793c7a20a8621a341e06945ddcbcc45c07
parentCollecting the list of packages after the download allows us to install (diff)
downloadcore-4d1c70557c6d23c8aa736396f49190de354b72ca.tar.gz
core-4d1c70557c6d23c8aa736396f49190de354b72ca.tar.xz
core-4d1c70557c6d23c8aa736396f49190de354b72ca.zip
Use debootstrap to bootstrap Debian based systems.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@572 95ad53e4-c205-0410-b2fa-d234c58c8868
-rwxr-xr-xinstaller/slxossetup24
-rw-r--r--installer/systems/ubuntu610/settings8
2 files changed, 27 insertions, 5 deletions
diff --git a/installer/slxossetup b/installer/slxossetup
index d7551bf1..0535a88f 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -92,13 +92,25 @@ function install_prereq_packages()
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)
- dpkg --root="${SLX_STAGE1_PATH}" --unpack "${package}"
+ 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
@@ -112,6 +124,16 @@ function install_prereq_packages()
esac
done
+ # Ckech if we have to bootstrap
+ if test -x "${BOOTSTRAP_PATH}/usr/sbin/debootstrap"; then
+ DEBOOTSTRAP_DIR="${BOOTSTRAP_PATH}/usr/lib/debootstrap" \
+ "${BOOTSTRAP_PATH}/usr/sbin/debootstrap" \
+ "${SLX_INST_SOURCE_DISTRIBUTION_main}" \
+ "${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}" || \
diff --git a/installer/systems/ubuntu610/settings b/installer/systems/ubuntu610/settings
index 6e8162ac..81e9286d 100644
--- a/installer/systems/ubuntu610/settings
+++ b/installer/systems/ubuntu610/settings
@@ -1,10 +1,10 @@
SLX_INST_SOURCE_BASEURL="http://ftp-1.gwdg.de/pub/linux/debian/ubuntu"
SLX_INST_SOURCE_COMPONENTS="main restricted multiverse universe"
-SLX_INST_SOURCE_NAME_ubuntu610="Ubuntu 6.10"
-SLX_INST_SOURCE_DISTRIBUTION_ubuntu610="edgy"
+SLX_INST_SOURCE_NAME_main="Ubuntu 6.10"
+SLX_INST_SOURCE_DISTRIBUTION_main="edgy"
SLX_INST_SOURCE_NAME_ubuntu610updates="Ubuntu 6.10 updates"
SLX_INST_SOURCE_DISTRIBUTION_ubuntu610updates="edgy-updates"
SLX_INST_SOURCE_NAME_ubuntu610security="Ubuntu 6.10 security"
SLX_INST_SOURCE_DISTRIBUTION_ubuntu610security="edgy-security"
-SLX_BASE_PREREQ_PACKAGES=""
-SLX_INSTALL_PACKAGES_MAIN="libc6 bash"
+SLX_BASE_PREREQ_PACKAGES="debootstrap"
+SLX_INSTALL_PACKAGES_MAIN="kaddressbook kmail kontact korganizer"