copy blkid only for dreambox

oe-alliance · Oct 14, 2023 · d170a15 · d170a15
1 parent f556a70
commit d170a15
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/ofgwrite.c b/ofgwrite.c
@@ -1131,25 +1131,31 @@ int umount_rootfs(int steps)
 		ret += system("cp -arf /bin/sh*          /newroot/bin");
 		ret += system("cp -arf /bin/bash*        /newroot/bin");
 		ret += system("cp -arf /sbin/init*       /newroot/sbin");
-		ret += system("cp -arf /sbin/blkid*       /newroot/sbin");
 		ret += system("cp -arf /lib64/libc*        /newroot/lib64");
-		ret += system("cp -arf /lib64/libblkid.*   /newroot/lib64");
 		ret += system("cp -arf /lib64/ld*          /newroot/lib64");
 		ret += system("cp -arf /lib64/libtinfo*    /newroot/lib64");
 		ret += system("cp -arf /lib64/libdl*       /newroot/lib64");
+		if (android)
+		{
+			ret += system("cp -arf /sbin/blkid*       /newroot/sbin");
+			ret += system("cp -arf /lib64/libblkid.*   /newroot/lib64");
+		}
 	}
 	else
 	{
 		ret =  system("cp -arf /bin/busybox*     /newroot/bin");
 		ret += system("cp -arf /bin/sh*          /newroot/bin");
 		ret += system("cp -arf /bin/bash*        /newroot/bin");
 		ret += system("cp -arf /sbin/init*       /newroot/sbin");
-		ret += system("cp -arf /sbin/blkid*       /newroot/sbin");
 		ret += system("cp -arf /lib/libc*        /newroot/lib");
-		ret += system("cp -arf /lib/libblkid.*   /newroot/lib");
 		ret += system("cp -arf /lib/ld*          /newroot/lib");
 		ret += system("cp -arf /lib/libtinfo*    /newroot/lib");
 		ret += system("cp -arf /lib/libdl*       /newroot/lib");
+		if (android)
+		{
+			ret += system("cp -arf /sbin/blkid*       /newroot/sbin");
+			ret += system("cp -arf /lib/libblkid.*   /newroot/lib");
+		}
 	}
 
 	if (ret != 0)