From b19a75611379e0a57a3edf06eb702a41109be60b Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 9 Jan 2007 01:28:04 +0000
Subject: x86_64 architecture integration should be started ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@604 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 Makefile              | 10 ++++++----
 initramfs/mkdxsinitrd |  1 +
 initramfs/slxmkramfs  | 14 +++++++-------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 9ca2870d..f3be5ba0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 # Makefile for creating project tarball and installing the project
 # to the various destination directories
 #
-# Lars Mueller <lm@openslx.com>, 2006
-# Dirk von Suchodoletz <dvs@openslx.com>, 2006
+# Lars Mueller <lm@openslx.com>, 2006, 2007
+# Dirk von Suchodoletz <dvs@openslx.com>, 2006, 2007
 # Michael Janczyk, 2006
 #
-# (c) 2006 - OpenSLX.ORG Project
+# (c) 2006, 2007 - OpenSLX GmbH
 
 # the following defaults should be filled via 'configure'
 # and each of them can be overriden by setting the environment variable
@@ -151,7 +151,9 @@ supported."; \
 	  tar -xp -C $(SLX_SHARE_PATH)
 	@cd theming; tar --exclude=.svn -cp * | \
 	  tar -xp -C $(SLX_SHARE_PATH)/themes; cd ..
-	@cp -p tools/busybox{,.links} installer/slxbootstrap $(SLX_SHARE_PATH)/busybox/
+	@# ia32 busybox should be renamed accordingly ...
+	@cp -p tools/busybox{,.links,.x86_64} installer/slxbootstrap \
+	  $(SLX_SHARE_PATH)/busybox/
 
 	@# create pre-/postinit scripts for us in initramfs:
 	@echo -e "#!/bin/sh\n#\n# This script allows the local admin to \
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 7403a254..424ace18 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -502,6 +502,7 @@ if [ "$use_busybox" = 1 ]; then
 ${SLX_SHARE_PATH}/busybox directory."; }
 fi
 if [ -n "$use_busybox" ] ; then
+  # somehow the target platform should be defined and proper busybox copied
   cp ${SLX_SHARE_PATH}/busybox/busybox ${INSTDIR}/bin
   for bbins in [ ar arping ash bunzip2 cat chmod chown chroot cp cpio cut \
        date dd df dmesg du echo env expr fdisk free grep gunzip hwclock \
diff --git a/initramfs/slxmkramfs b/initramfs/slxmkramfs
index 1e9c7c06..6a0bba9d 100755
--- a/initramfs/slxmkramfs
+++ b/initramfs/slxmkramfs
@@ -8,7 +8,7 @@
 # Dirk von Suchodoletz <dvs@OpenSLX.com>, 2006, 2007
 #
 # (c) 2003 - 2006 - RZ Universitaet Freiburg
-# (c) 2006, 2007 - OpenSLX.org Project
+# (c) 2006, 2007 - OpenSLX GmbH
 
 # NOTE (zooey):
 #   this whole file should be reimplemented in perl in order to
@@ -427,14 +427,14 @@ if [ "$use_busybox" = 1 ]; then
 ${SLX_SHARE_PATH}/busybox directory."; }
 fi
 if [ -n "$use_busybox" ] ; then
+  # somehow the target platform should be defined and proper busybox copied
   cp ${SLX_SHARE_PATH}/busybox/busybox ${INSTDIR}/bin
   for bbins in [ ar arping ash bunzip2 cat chmod chown chroot cp cpio cut \
-        date dd df dmesg du echo env expr fdisk free grep gunzip hwclock \
-		insmod \
-		id ip kill killall ln ls lsmod mdev mkdir mke2fs mkfs.ext2 mkfs.ext3 \
-        mknod mkswap modprobe mount mv nice ping printf ps rdate rm rmmod sed \
-        sleep sort swapoff swapon switch_root tar test tftp time touch tr \
-		udhcpc umount uptime usleep vconfig vi zcat zcip; do
+      date dd df dmesg du echo env expr fdisk free grep gunzip hwclock \
+      insmod id ip kill killall ln ls lsmod mdev mkdir mke2fs mkfs.ext2 \
+      mkfs.ext3 mknod mkswap modprobe mount mv nice ping printf ps rdate rm \
+      rmmod sed sleep sort swapoff swapon switch_root tar test tftp time \
+      touch tr udhcpc umount uptime usleep vconfig vi zcat zcip; do
     ln -fs /bin/busybox ${INSTDIR}/bin/$bbins
   done
   # fake the sh link in busybox environment
-- 
cgit v1.2.3-55-g7522