commit 40e2b1d8942bacd0cc2ca5b5d9d1324f92fbdc61
author Alice Wang <aliceywang@google.com> Thu Jan 12 08:36:08 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 12 08:36:08 2023 +0000
tree 8e1f830556e9b65e5009f9459f50e05823cb4b6e
parent 958b1fa60b3fea79dbb0c27453b97a314f6df885
parent 8aa3cb177f52cd4de1199c3f02cc3449fd2012ac

Merge "[microdroid] Rename the partition name of microdroid_kernel to boot"

microdroid/init.rc

diff --git a/microdroid/init.rc b/microdroid/init.rc
index 7402481..bc42791 100644
--- a/microdroid/init.rc
+++ b/microdroid/init.rc
@@ -165,7 +165,6 @@
     class core
     critical
     seclabel u:r:ueventd:s0
-    shutdown critical
     capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID MKNOD NET_ADMIN SETGID SETUID SYS_MODULE SYS_RAWIO
 
 service console /system/bin/sh

microdroid/initrd/src/main.rs

diff --git a/microdroid/initrd/src/main.rs b/microdroid/initrd/src/main.rs
index 69c6ae4..3f1fab5 100644
--- a/microdroid/initrd/src/main.rs
+++ b/microdroid/initrd/src/main.rs
@@ -54,7 +54,8 @@
         checksum += get_checksum(&bootconfig)?;
     }
 
-    let padding_size: usize = FOOTER_ALIGNMENT - (initrd_size + bootconfig_size) % FOOTER_ALIGNMENT;
+    let padding_size: usize =
+        (FOOTER_ALIGNMENT - (initrd_size + bootconfig_size) % FOOTER_ALIGNMENT) % FOOTER_ALIGNMENT;
     output_file.write_all(&ZEROS[..padding_size])?;
     output_file.write_all(&((padding_size + bootconfig_size) as u32).to_le_bytes())?;
     output_file.write_all(&checksum.to_le_bytes())?;