From dba2bd0f3dc6e880545dbe4bf33a6e11bf7c1bfb Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 23 Sep 2007 17:50:42 +0000
Subject: Added the 64bit busybox binary (both busyboxes are compiled on Debian
 Sarge systems), fixed the remaining patch ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1346 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 tools/busybox-patches/unionfs-run-init-1.6.0.diff |  14 --------------
 tools/busybox-patches/unionfs-run-init.diff       |  20 +++++++-------------
 tools/busybox.x86_64                              | Bin 413608 -> 436872 bytes
 3 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 tools/busybox-patches/unionfs-run-init-1.6.0.diff

(limited to 'tools')

diff --git a/tools/busybox-patches/unionfs-run-init-1.6.0.diff b/tools/busybox-patches/unionfs-run-init-1.6.0.diff
deleted file mode 100644
index 14df85b8..00000000
--- a/tools/busybox-patches/unionfs-run-init-1.6.0.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru ../busybox-1.6.0.orig/util-linux/switch_root.c ./util-linux/switch_root.c
---- ../busybox-1.6.0.orig/util-linux/switch_root.c	2007-06-01 13:48:41.000000000 +0200
-+++ ./util-linux/switch_root.c	2007-06-15 12:31:40.000000000 +0200
-@@ -105,6 +105,10 @@
- 	// Overmount / with newdir and chroot into it.  The chdir is needed to
- 	// recalculate "." and ".." links.
- 
-+	if ( !lstat("/rorootfs", &st1 ) )
-+		if ( mount("/rorootfs", "/", NULL, MS_MOVE, NULL) )
-+			bb_error_msg_and_die("moving rorootfs");
-+
- 	if (mount(".", "/", NULL, MS_MOVE, NULL) || chroot("."))
- 		bb_error_msg_and_die("error moving root");
- 	xchdir("/");
diff --git a/tools/busybox-patches/unionfs-run-init.diff b/tools/busybox-patches/unionfs-run-init.diff
index a0cde9f2..14df85b8 100644
--- a/tools/busybox-patches/unionfs-run-init.diff
+++ b/tools/busybox-patches/unionfs-run-init.diff
@@ -1,13 +1,7 @@
-If we find the special directory, /rorootfs move the mount point of the later
-root fs on top.  We check if we have unionfs available to make the ro fs rw.
-Unfortunately the unionfs code is incomplete (mmap issue).   Thus the original
-mount point of the ro fs part is not moved accordingly.
-
-Index: busybox-1.4.2/util-linux/switch_root.c
-===================================================================
---- busybox-1.4.2.orig/util-linux/switch_root.c
-+++ busybox-1.4.2/util-linux/switch_root.c
-@@ -103,6 +103,10 @@ int switch_root_main(int argc, char *arg
+diff -ru ../busybox-1.6.0.orig/util-linux/switch_root.c ./util-linux/switch_root.c
+--- ../busybox-1.6.0.orig/util-linux/switch_root.c	2007-06-01 13:48:41.000000000 +0200
++++ ./util-linux/switch_root.c	2007-06-15 12:31:40.000000000 +0200
+@@ -105,6 +105,10 @@
  	// Overmount / with newdir and chroot into it.  The chdir is needed to
  	// recalculate "." and ".." links.
  
@@ -15,6 +9,6 @@ Index: busybox-1.4.2/util-linux/switch_root.c
 +		if ( mount("/rorootfs", "/", NULL, MS_MOVE, NULL) )
 +			bb_error_msg_and_die("moving rorootfs");
 +
- 	if (mount(".", "/", NULL, MS_MOVE, NULL) || chroot(".") || chdir("/"))
- 		bb_error_msg_and_die("moving root");
- 
+ 	if (mount(".", "/", NULL, MS_MOVE, NULL) || chroot("."))
+ 		bb_error_msg_and_die("error moving root");
+ 	xchdir("/");
diff --git a/tools/busybox.x86_64 b/tools/busybox.x86_64
index cc975233..10dd8516 100755
Binary files a/tools/busybox.x86_64 and b/tools/busybox.x86_64 differ
-- 
cgit v1.2.3-55-g7522