missing ld-linux fix

3 files changed, 31 insertions, 13 deletions

diff --git a/remote/1 b/remote/1
new file mode 100644
index 00000000..9fd65f79
--- /dev/null
+++ b/remote/1
@@ -0,0 +1,28 @@
+execve("stage3.2/openslx/bin/busybox", ["stage3.2/openslx/bin/busybox", "2"], [/* 51 vars */]) = 0
+brk(0)                                  = 0x85d0000
+access("/etc/ld.so.nohwcap", F_OK)      = -1 ENOENT (No such file or directory)
+mmap2(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb771a000
+access("/etc/ld.so.preload", R_OK)      = -1 ENOENT (No such file or directory)
+open("/etc/ld.so.cache", O_RDONLY)      = 3
+fstat64(3, {st_mode=S_IFREG|0644, st_size=96487, ...}) = 0
+mmap2(NULL, 96487, PROT_READ, MAP_PRIVATE, 3, 0) = 0xb7702000
+close(3)                                = 0
+access("/etc/ld.so.nohwcap", F_OK)      = -1 ENOENT (No such file or directory)
+open("/lib/i386-linux-gnu/libc.so.6", O_RDONLY) = 3
+read(3, "\177ELF\1\1\1\0\0\0\0\0\0\0\0\0\3\0\3\0\1\0\0\0p\222\1\0004\0\0\0"..., 512) = 512
+fstat64(3, {st_mode=S_IFREG|0755, st_size=1568968, ...}) = 0
+mmap2(NULL, 1579544, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0xb7580000
+mmap2(0xb76fc000, 12288, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x17c) = 0xb76fc000
+mmap2(0xb76ff000, 10776, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0xb76ff000
+close(3)                                = 0
+mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0xb757f000
+set_thread_area({entry_number:-1 -> 6, base_addr:0xb757f8d0, limit:1048575, seg_32bit:1, contents:0, read_exec_only:0, limit_in_pages:1, seg_not_present:0, useable:1}) = 0
+mprotect(0xb76fc000, 8192, PROT_READ)   = 0
+mprotect(0x80d2000, 4096, PROT_READ)    = 0
+mprotect(0xb773b000, 4096, PROT_READ)   = 0
+munmap(0xb7702000, 96487)               = 0
+getuid32()                              = 1000
+write(2, "2", 12)                        = 1
+write(2, ": applet not found\n", 19: applet not found
+)    = 19
+exit_group(1)                           = ?
diff --git a/remote/setup-tools.sh b/remote/setup-tools.sh
index a345293d..e61d8903 100755
--- a/remote/setup-tools.sh
+++ b/remote/setup-tools.sh
@@ -79,19 +79,9 @@ copyfileswithdependencies ()
 	done 
 
 	# fast hack
-        LDLINUX=$(ldd $FILE | grep ld-linux | awk '{print $1}' |cut -c2-)
+    LDLINUX=$(ldd $FILE | grep ld-linux | awk '{print $1}' |cut -c2-)
 	echo "/$LDLINUX" >> $COPYFILES_LIST
-	tar -cpv $(readlink "/$LDLINUX") | tar -xpv -C $INIT_DIR
-        case $LDLINUX in
-          *lib/*) 
-		#cp -a /lib/ld-* $INIT_DIR/lib/ ;;
-		#tar -cpv $(readlink "/$LDLINUX") | tar -xpv -C $INIT_DIR
-		;;
-          *lib64/*) 
-		#cp -a /lib64/ld-* $INIT_DIR/lib64/ ;;
-		#tar -cpv "/lib64/ld-*" | tar -xpv -C $INIT_DIR 
-		;;
-        esac
+	tar -cpv $(readlink -f "/$LDLINUX") | tar -xpv -C $INIT_DIR
 
 	for FILENAME in $REQUIRED_FILES
 	do
diff --git a/remote/tools/busybox/busybox.conf b/remote/tools/busybox/busybox.conf
index d4a8cccf..612541c4 100644
--- a/remote/tools/busybox/busybox.conf
+++ b/remote/tools/busybox/busybox.conf
@@ -2,4 +2,4 @@ GIT=git://git.openslx.org/openslx/tools/busybox
 DEPS=""
 TARGET_DIR="openslx"
 REQUIRED_BINARIES="busybox"
-REQUIRED_FILES="addgroup cp echo ip login mt rm sync adduser cpio egrep ipaddr ls mv rmdir tar ash date false iplink lsattr netstat run-parts touch dd fdflush iproute lsblk nice sed true cat delgroup fgrep iprule mkdir pidof setarch umount catv deluser getopt iptunnel mknod ping setserial uname chattr df grep kill mktemp pipe_progress sh usleep chgrp dmesg gunzip linux32 more printenv sleep vi chmod gzip mount  ps linux64 stty watch chown dnsdomainname dumpkmap hostname ln mountpoint pwd su zcat [ [[ ar arping awk basename chrt chsum clear cmp crontab cut dc diff dirname dos2unix du eject env expr ether-wake fdformat find fold free fuser head hostid id install killall killall5 last less logname lsof lspci md5sum mesg microcom mkfifo nohup nslookup od passwd patch printf readlink realpath reset resize seq sha1sum sha256sum sha512sum sort strings tail tee telnet test tftp time top tr traceroute tty uniq unix2dos unzip uptime uudecode uuencode vlock wc wget which who whoami xargs yes pivot_root rtstat runlevel udhcpc insmod halt getty devmem fsck hdparm ifconfig ifdown ifup klogd loadkmap losetup lsmod makedevs mdev modprobe nameif rmmod route setconsole start-stop-daemon sulogin swapoff swapon switch_root sysctl syslogd vconfig watchdog loadfont rdate setlogcons chroot crond dnsd inetd dnbd3"
+REQUIRED_FILES="setsid addgroup cp echo ip login mt rm sync adduser cpio egrep ipaddr ls mv rmdir tar ash date false iplink lsattr netstat run-parts touch dd fdflush iproute lsblk nice sed true cat delgroup fgrep iprule mkdir pidof setarch umount catv deluser getopt iptunnel mknod ping setserial uname chattr df grep kill mktemp pipe_progress sh usleep chgrp dmesg gunzip linux32 more printenv sleep vi chmod gzip mount  ps linux64 stty watch chown dnsdomainname dumpkmap hostname ln mountpoint pwd su zcat [ [[ ar arping awk basename chrt chsum clear cmp crontab cut dc diff dirname dos2unix du eject env expr ether-wake fdformat find fold free fuser head hostid id install killall killall5 last less logname lsof lspci md5sum mesg microcom mkfifo nohup nslookup od passwd patch printf readlink realpath reset resize seq sha1sum sha256sum sha512sum sort strings tail tee telnet test tftp time top tr traceroute tty uniq unix2dos unzip uptime uudecode uuencode vlock wc wget which who whoami xargs yes pivot_root rtstat runlevel udhcpc insmod halt getty devmem fsck hdparm ifconfig ifdown ifup klogd loadkmap losetup lsmod makedevs mdev modprobe nameif rmmod route setconsole start-stop-daemon sulogin swapoff swapon switch_root sysctl syslogd vconfig watchdog loadfont rdate setlogcons chroot crond dnsd inetd dnbd3"