summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorOliver Tappe2007-01-14 19:43:35 +0100
committerOliver Tappe2007-01-14 19:43:35 +0100
commit3c50a839d6eb0d32f7eeb0d07daba537d67f4527 (patch)
tree2879986451a17d13e56058b3524b609fe8646281 /installer
parent* added support for --man and --verbose (diff)
downloadcore-3c50a839d6eb0d32f7eeb0d07daba537d67f4527.tar.gz
core-3c50a839d6eb0d32f7eeb0d07daba537d67f4527.tar.xz
core-3c50a839d6eb0d32f7eeb0d07daba537d67f4527.zip
* moved basic perl modules into new 'lib' folder in order to make them available
to other parts than the config-db git-svn-id: http://svn.openslx.org/svn/openslx/trunk@625 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rwxr-xr-xinstaller/slxossetup7
1 files changed, 4 insertions, 3 deletions
diff --git a/installer/slxossetup b/installer/slxossetup
index c6f6c05f..ae48877f 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -121,7 +121,8 @@ function setup_busybox_chroot()
cp -p /etc/resolv.conf "${CHROOT_DIR}/etc/"
# FIXME this might not be enough to satisfy the resolver
- for file in /lib/libnss_dns* /lib/libresolv*; do
+# for file in /lib/libnss_dns* /lib/libresolv*; do
+ for file in /lib/xxlib_dns* /lib/xxlibresolv*; do
test -e "${file}" || \
continue
dir="${CHROOT_DIR}/${file%/*}"
@@ -134,7 +135,7 @@ function setup_busybox_chroot()
function setup_busybox_stage1_config()
{
local key value CONFIG_FILE
-
+
CONFIG_FILE="${CHROOT_DIR}/etc/slxbootstrap.conf"
test -d "${CHROOT_DIR}/etc" || \
@@ -363,7 +364,7 @@ function install_slxselection()
done
test -z "${packagelist}" && \
return
-
+
case "${META_PACKAGER}" in
*debian*|*ubuntu**)
: ${SLX_STAGE1_INSTALL_OPTIONS:=-y}