diff -Naur busybox-1.20.2/coreutils/cp.c busybox-1.20.2-magellan/coreutils/cp.c
--- busybox-1.20.2/coreutils/cp.c	2012-06-26 15:35:45.000000000 +0200
+++ busybox-1.20.2-magellan/coreutils/cp.c	2012-07-25 17:30:16.809986645 +0200
@@ -80,7 +80,8 @@
 		;
 #endif
 	// -v (--verbose) is ignored
-	flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPv");
+	// -x (--one-file-system) is ignored
+	flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPvx");
 	/* Options of cp from GNU coreutils 6.10:
 	 * -a, --archive
 	 * -f, --force