Merge branch 'master' of https://github.com/Andy-Python-Programmer/aero

Author: Andy-Python-Programmer

aero.py

@@ -339,7 +339,7 @@ def prepare_iso(args, kernel_bin, user_bins):
     shutil.copy(os.path.join('src', '.cargo', 'term_background.bmp'), iso_root)
     shutil.copy(os.path.join(limine_path, 'limine.sys'), iso_root)
     shutil.copy(os.path.join(limine_path, 'limine-cd.bin'), iso_root)
-    shutil.copy(os.path.join(limine_path, 'limine-eltorito-efi.bin'), iso_root)
+    shutil.copy(os.path.join(limine_path, 'limine-cd-efi.bin'), iso_root)
 
     initramfs_root = os.path.join(BUILD_DIR, 'initramfs_root')
 
@@ -412,13 +412,13 @@ def cp(src, dest):
 
     code, _, xorriso_stderr = run_command([
         'xorriso', '-as', 'mkisofs', '-b', 'limine-cd.bin', '-no-emul-boot', '-boot-load-size', '4',
-        '-boot-info-table', '--efi-boot', 'limine-eltorito-efi.bin', '-efi-boot-part',
+        '-boot-info-table', '--efi-boot', 'limine-cd-efi.bin', '-efi-boot-part',
         '--efi-boot-image', '--protective-msdos-label', iso_root, '-o', iso_path
     ], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
     if code != 0:
         print('Failed to create the ISO image')
-        print(xorriso_stderr)
+        print(xorriso_stderr.decode('utf-8'))
 
         return None
 

src/aero_kernel/src/userland/signals.rs

@@ -396,7 +396,7 @@ impl Signals {
     /// * If `old_set` is not `None`, the previous value of the signal mask is
     /// stored in oldset.
     ///
-    /// * NOTE: If `set` is `None`, then the signal mask is unchanged (i.e., `how` is
+    /// * If `set` is `None`, then the signal mask is unchanged (i.e., `how` is
     /// ignored), but the current value of the signal mask is returned in `old_set`
     /// (if it is not `None`).
     pub fn set_mask(&self, how: SigProcMask, set: Option<u64>, old_set: Option<&mut u64>) {