From c6b758e562a15c23c991ce783a9f0b9dbb527601 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Fri, 15 Dec 2006 00:39:48 +0000 Subject: Added new busybox in new place (tools, Makefile, ...) Busybox has modified switch_root (same as for run-init ...) Updated mkdxsinitrd for busybox usage (same has to be done for slxmkramfs when tested properly) Minor fixes ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@536 95ad53e4-c205-0410-b2fa-d234c58c8868 --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6fdd61b8..c9c790b7 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # Dirk von Suchodoletz , 2006 # Michael Janczyk, 2006 # -# (c) 2006 - OpenSLX.com +# (c) 2006 - OpenSLX.ORG Project # the following defaults should be filled via 'configure' # and each of them can be overriden by setting the environment variable @@ -113,6 +113,7 @@ supported."; \ -p $(SLX_BIN_PATH) \ -p $(SLX_SHARE_PATH)/templates \ -p $(SLX_SHARE_PATH)/initramfs \ + -p $(SLX_SHARE_PATH)/busybox \ -p $(SLX_PRIVATE_PATH)/config/default/initramfs \ -p $(SLX_PRIVATE_PATH)/config/default/rootfs \ -p $(SLX_PRIVATE_PATH)/db \ @@ -150,6 +151,7 @@ supported."; \ tar -xp -C $(SLX_SHARE_PATH) @cd theming; tar --exclude=.svn -cp * | \ tar -xp -C $(SLX_SHARE_PATH)/themes; cd .. + @cp tools/busybox $(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 \ @@ -191,7 +193,8 @@ functions via\n# inclusion: '. /etc/functions' ..." \ @ln -sf $(SLX_BIN_PATH)/slxversion $(USR_BIN_PATH)/ vmware_install: - @# we should read the config file here!! + @# we should read the config file here or better have a separate + @# script for installing vmware related stuff @echo "Installing VMware files to $(SLX_VMWARE_PATH)" @mkdir -p $(SLX_VMWARE_PATH)/templ \ -p $(SLX_VMWARE_PATH)/vmsessions/kdm -- cgit v1.2.3-55-g7522