From d1f5aedd76df437a08f3283fa00bc8a9dab7fa2b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 4 Jul 2014 14:46:20 +0200
Subject: "Fedora Support", step 1 -> Several changes: 1) Make sure /bin /sbin
 /lib and /lib64 are ALWAYS symlinks to /usr/XXX,    no matter what the
 current distribution does. 2) Make sure nobody and nogroup exist. 3) Fix
 various modules making assumptions that are not true on every    distro. 4)
 Add symlinks to kdm module since fedora is looking for kdmrc in    yet
 another spot. 5) Add detection of fedora, support its package manager

What still breaks: dnbd3
Other distros might not work now, they need adaption to changed logic
in some modules.
---
 remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 1 +
 remote/rootfs/rootfs-stage31/data/init                   | 4 +++-
 remote/rootfs/rootfs-stage31/module.build                | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'remote/rootfs/rootfs-stage31')

diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig
index 036e90ad..5a97d7ac 100644
--- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig
+++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig
@@ -75,6 +75,7 @@ HEREEND
 #
 
 fetch_sysconfig
+. "${CONFIG}-remote"
 fetch_config_files
 update_sysconfig
 true
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index f49b3000..699c68ff 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -80,7 +80,9 @@ bench_event "STAGE32" "Downloaded stage 3.2"
 
 # copy files needed for stage3.2 to FUTURE_ROOT
 echo "Copying busybox etc. to stage32..."
-tar -cp "/bin" "/sbin" "/inc/functions" | tar -xp -C "${FUTURE_ROOT}/opt/openslx/"
+cp -a "/usr/bin" "/usr/sbin" "${FUTURE_ROOT}/opt/openslx/"
+mkdir -p "${FUTURE_ROOT}/opt/openslx/inc"
+cp -a "/inc/functions" "${FUTURE_ROOT}/opt/openslx/inc/"
 
 # set the SLX_ROOT_PASS if given in config
 if [ ! -z "$SLX_ROOT_PASS" ]; then
diff --git a/remote/rootfs/rootfs-stage31/module.build b/remote/rootfs/rootfs-stage31/module.build
index c9346603..bc45b6fd 100644
--- a/remote/rootfs/rootfs-stage31/module.build
+++ b/remote/rootfs/rootfs-stage31/module.build
@@ -4,7 +4,7 @@ fetch_source() {
 }
 
 build() {
-	local COPYLIST BIN_LOCATION DRM_MODULES FILE BIN MODNAME PCI_FILE ALIAS VENDOR DEVICE
+	local COPYLIST BIN_LOCATION DRM_MODULES FILE BIN MODNAME PCI_FILE ALIAS VENDOR DEVICE LIB
 	COPYLIST="list_binaries_and_files"
 	[ -e "$COPYLIST" ] && rm -f "$COPYLIST"
 	for BIN in $REQUIRED_BINARIES; do
@@ -14,7 +14,7 @@ build() {
 	done
 
 	mkdir -p "$MODULE_BUILD_DIR/lib"
-	find /lib /lib64 /usr/lib /usr/lib64 \( -name "libnss_dns*" -o -name "libresolv*" \) -exec cp -a {} "$MODULE_BUILD_DIR/lib/" \;
+	find /lib /lib64 /usr/lib /usr/lib64 \( -name "libnss_dns*" -o -name "libresolv*" \) >> "$COPYLIST"
 
 	tarcopy "$(cat "$COPYLIST" | sort -u)" "$MODULE_BUILD_DIR"
 
-- 
cgit v1.2.3-55-g7522