Merge changes from topic "ferrochrome-disk-resize-integration" into main
* changes:
Modify installer to integrate disk resize
Modify debian build script to integrate disk resize
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
index 5967b6f..82df5c5 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/InstallerService.java
@@ -25,6 +25,7 @@
import android.content.pm.ServiceInfo;
import android.os.Build;
import android.os.IBinder;
+import android.os.SELinux;
import android.util.Log;
import androidx.annotation.Nullable;
@@ -37,6 +38,7 @@
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import java.io.BufferedInputStream;
+import java.io.File;
import java.io.IOException;
import java.lang.ref.WeakReference;
import java.net.URL;
@@ -45,6 +47,7 @@
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.Arrays;
+import java.util.Objects;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -60,6 +63,9 @@
? "https://github.com/ikicha/debian_ci/releases/download/release_x86_64/images.tar.gz"
: "https://github.com/ikicha/debian_ci/releases/download/release_aarch64/images.tar.gz";
+ private static final String SELINUX_FILE_CONTEXT =
+ "u:object_r:virtualizationservice_data_file:";
+
private final Object mLock = new Object();
private Notification mNotification;
@@ -144,7 +150,9 @@
() -> {
// TODO(b/374015561): Provide progress update
boolean success = downloadFromSdcard() || downloadFromUrl();
-
+ if (success) {
+ reLabelImagesSELinuxContext();
+ }
stopForeground(STOP_FOREGROUND_REMOVE);
synchronized (mLock) {
@@ -156,6 +164,24 @@
});
}
+ private void reLabelImagesSELinuxContext() {
+ File payloadFolder = InstallUtils.getInternalStorageDir(this);
+
+ // The context should be u:object_r:privapp_data_file:s0:c35,c257,c512,c768
+ // and we want to get s0:c35,c257,c512,c768 part
+ String level = SELinux.getFileContext(payloadFolder.toString()).split(":", 4)[3];
+ String targetContext = SELINUX_FILE_CONTEXT + level;
+
+ File[] files = payloadFolder.listFiles();
+ for (File file : files) {
+ if (file.isFile() &&
+ !Objects.equals(SELinux.getFileContext(file.toString()),
+ targetContext)) {
+ SELinux.setFileContext(file.toString(), targetContext);
+ }
+ }
+ }
+
private boolean downloadFromSdcard() {
// Installing from sdcard is preferred, but only supported only in debuggable build.
if (Build.isDebuggable()) {
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
index 7575d05..4e32de7 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -89,6 +89,7 @@
private ConditionVariable mBootCompleted = new ConditionVariable();
private static final int POST_NOTIFICATIONS_PERMISSION_REQUEST_CODE = 101;
private ActivityResultLauncher<Intent> manageExternalStorageActivityResultLauncher;
+ private static int diskSizeStep;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -104,6 +105,8 @@
}
setContentView(R.layout.activity_headless);
+ diskSizeStep = getResources().getInteger(
+ R.integer.disk_size_round_up_step_size_in_mb) << 20;
MaterialToolbar toolbar = (MaterialToolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
@@ -293,9 +296,9 @@
}
}
- private static File getPartitionFile(Context context, String fileName)
+ public static File getPartitionFile(Context context, String fileName)
throws FileNotFoundException {
- File file = new File(context.getFilesDir(), fileName);
+ File file = new File(InstallUtils.getInternalStorageDir(context), fileName);
if (!file.exists()) {
Log.d(TAG, file.getAbsolutePath() + " - file not found");
throw new FileNotFoundException("File not found: " + fileName);
@@ -516,15 +519,14 @@
return mBootCompleted.block(timeoutMillis);
}
- private long roundUpDiskSize(long diskSize) {
- // Round up every disk_size_round_up_step_size_in_mb MB
- int disk_size_step = getResources().getInteger(
- R.integer.disk_size_round_up_step_size_in_mb) * 1024 * 1024;
- return (long) Math.ceil(((double) diskSize) / disk_size_step) * disk_size_step;
+ private static long roundUpDiskSize(long diskSize) {
+ // Round up every diskSizeStep MB
+ return (long) Math.ceil(((double) diskSize) / diskSizeStep) * diskSizeStep;
}
- private long getMinFilesystemSize(File file) throws IOException, NumberFormatException {
+ public static long getMinFilesystemSize(File file) throws IOException, NumberFormatException {
try {
+ runE2fsck(file.getAbsolutePath());
String result = runCommand("/system/bin/resize2fs", "-P", file.getAbsolutePath());
// The return value is the number of 4k block
long minSize = Long.parseLong(
@@ -547,12 +549,10 @@
getString(R.string.preference_file_key), Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedPref.edit();
- long minDiskSize = getMinFilesystemSize(file);
- editor.putLong(getString(R.string.preference_min_disk_size_key), minDiskSize);
-
long currentDiskSize = getFilesystemSize(file);
+ // The default partition size is 6G
long newSizeInBytes = sharedPref.getLong(getString(R.string.preference_disk_size_key),
- roundUpDiskSize(currentDiskSize));
+ 6L << 30);
editor.putLong(getString(R.string.preference_disk_size_key), newSizeInBytes);
editor.apply();
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsDiskResizeActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsDiskResizeActivity.kt
index 54e8ab2..58be98d 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsDiskResizeActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsDiskResizeActivity.kt
@@ -55,13 +55,10 @@
0
)
).toFloat();
+ val partition = MainActivity.getPartitionFile(this, "root_part")
val minDiskSizeMb =
- bytesToMb(
- sharedPref.getLong(
- getString(R.string.preference_min_disk_size_key),
- 0
- )
- ).toFloat();
+ bytesToMb(MainActivity.getMinFilesystemSize(partition)).toFloat()
+ .coerceAtMost(diskSizeMb)
val diskSizeText = findViewById<TextView>(R.id.settings_disk_resize_resize_gb_assigned)
val diskMaxSizeText = findViewById<TextView>(R.id.settings_disk_resize_resize_gb_max)
diff --git a/build/debian/build.sh b/build/debian/build.sh
index b4436c1..7fc9035 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -169,6 +169,19 @@
mv "${debian_cloud_image}/image_bookworm_nocloud_${debian_arch}.raw" "${out}"
}
+extract_partitions() {
+ root_partition_num=1
+ efi_partition_num=15
+
+ loop=$(losetup -f --show --partscan image.raw)
+ dd if=${loop}p$root_partition_num of=root_part
+ dd if=${loop}p$efi_partition_num of=efi_part
+ losetup -d ${loop}
+
+ sed -i "s/{root_part_guid}/$(sfdisk --part-uuid image.raw $root_partition_num)/g" vm_config.json
+ sed -i "s/{efi_part_guid}/$(sfdisk --part-uuid image.raw $efi_partition_num)/g" vm_config.json
+}
+
clean_up() {
rm -rf "${workdir}"
}
@@ -191,18 +204,29 @@
copy_android_config
run_fai
fdisk -l image.raw
-images=(image.raw)
+images=()
+
+cp $(dirname $0)/vm_config.json.${arch} vm_config.json
+
+if [[ "$arch" == "aarch64" ]]; then
+ extract_partitions
+ images+=(
+ root_part
+ efi_part
+ )
+fi
+
# TODO(b/365955006): remove these lines when uboot supports x86_64 EFI application
if [[ "$arch" == "x86_64" ]]; then
virt-get-kernel -a image.raw
mv vmlinuz* vmlinuz
mv initrd.img* initrd.img
images+=(
+ image.raw
vmlinuz
initrd.img
)
fi
-cp $(dirname $0)/vm_config.json.${arch} vm_config.json
# --sparse option isn't supported in apache-commons-compress
-tar czv -f images.tar.gz ${images[@]} vm_config.json
\ No newline at end of file
+tar czv -f images.tar.gz ${images[@]} vm_config.json
diff --git a/build/debian/vm_config.json.aarch64 b/build/debian/vm_config.json.aarch64
index 2df0a05..bbe590f 100644
--- a/build/debian/vm_config.json.aarch64
+++ b/build/debian/vm_config.json.aarch64
@@ -2,8 +2,20 @@
"name": "debian",
"disks": [
{
- "image": "$PAYLOAD_DIR/image.raw",
- "partitions": [],
+ "partitions": [
+ {
+ "label": "ROOT",
+ "path": "$PAYLOAD_DIR/root_part",
+ "writable": true,
+ "guid": "{root_part_guid}"
+ },
+ {
+ "label": "EFI",
+ "path": "$PAYLOAD_DIR/efi_part",
+ "writable": false,
+ "guid": "{efi_part_guid}"
+ }
+ ],
"writable": true
}
],