From 7fd4e674a071911989cf106ecddd6e1c782d5afa Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Thu, 29 Nov 2007 20:37:20 +0000
Subject: * replaced busybox.i586 with a version that actually contains the
 required   support for RPMs with bzip2-payload in rpm2cpio applet * updated
 quilt series file * removed old (unqualified) unionfs patch

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1415 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 tools/busybox-patches/series                |   4 +++-
 tools/busybox-patches/unionfs-run-init.diff |  14 --------------
 tools/busybox.i586                          | Bin 324396 -> 324524 bytes
 3 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 tools/busybox-patches/unionfs-run-init.diff

(limited to 'tools')

diff --git a/tools/busybox-patches/series b/tools/busybox-patches/series
index cefbae71..52424afc 100644
--- a/tools/busybox-patches/series
+++ b/tools/busybox-patches/series
@@ -1,2 +1,4 @@
 # series file useable by quilt
-unionfs-run-init.diff
+bzip2-payload-1.7.1.diff
+cryptpw-blowfish-1.7.1.diff
+unionfs-run-init-1.7.1.diff
diff --git a/tools/busybox-patches/unionfs-run-init.diff b/tools/busybox-patches/unionfs-run-init.diff
deleted file mode 100644
index 14df85b8..00000000
--- a/tools/busybox-patches/unionfs-run-init.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.i586 b/tools/busybox.i586
index 1ce81d40..a7916059 100755
Binary files a/tools/busybox.i586 and b/tools/busybox.i586 differ
-- 
cgit v1.2.3-55-g7522