fix: microcode, initrd and kernel at boot

luminusOS · Jul 25, 2021 · d773b4e · d773b4e
1 parent 7fba4a5
commit d773b4e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/base/airootfs/etc/calamares/modules/shellprocess.conf b/base/airootfs/etc/calamares/modules/shellprocess.conf
@@ -78,11 +78,11 @@ script:
     - "-rm @@ROOT@@/etc/skel/Desktop/calamares.desktop"
     - "-rm @@ROOT@@/home/@@USER@@/Desktop/calamares.desktop"
     - "sed -i 's/\\(MODULES *= *\\).*/\\1(i915? amdgpu? radeon? nouveau? vboxvideo? vmwgfx?)/' @@ROOT@@/etc/mkinitcpio.conf"
-#    - "sed -i 's/LuminOS_GNU-Linux/boot/' @@ROOT@@/efi/loader/entries/*.conf"
-#    - "sed -i 's/vmlinuz-linux/vmlinuz-linux\ninitrd  \/boot\/intel-ucode.img/g' @@ROOT@@/efi/loader/entries/*.conf"
-#    - "sed -i 's/vmlinuz-linux/vmlinuz-linux\ninitrd  \/boot\/amd-ucode.img/g' @@ROOT@@/efi/loader/entries/*.conf"
-    - "sed -i '$ s/$/ splash loglevel=3 rd.udev.log-priority=3 vt.global_cursor_default=0/' @@ROOT@@/efi/loader/entries/*.conf"
-#    - "-rm -r @@ROOT@@/efi/LuminOS_GNU-Linux"
+    - "sed -i 's/LuminOS_GNU-Linux//' @@ROOT@@/boot/loader/entries/*.conf"
+    - "sed -i $'/vmlinuz-linux/a initrd  \/intel-ucode.img' @@ROOT@@/boot/loader/entries/*.conf"
+    - "sed -i $'/vmlinuz-linux/a initrd  \/amd-ucode.img' @@ROOT@@/boot/loader/entries/*.conf"
+    - "sed -i '$ s/$/ splash loglevel=3 rd.udev.log-priority=3 vt.global_cursor_default=0/' @@ROOT@@/boot/loader/entries/*.conf"
+    - "-rm -r @@ROOT@@/boot/LuminOS_GNU-Linux"
 
 # You can change the description of the job (as it is displayed in the
 # progress bar during installation) by defining an *i18n* key, which

diff --git a/base/airootfs/etc/calamares/modules/unpackfs.conf b/base/airootfs/etc/calamares/modules/unpackfs.conf
@@ -103,4 +103,10 @@ unpack:
         destination: ""
     -   source: "/run/archiso/bootmnt/arch/boot/x86_64/vmlinuz-linux"
         sourcefs: "file"
-        destination: "/boot/vmlinuz-linux"
+        destination: "/boot/vmlinuz-linux"
+    -   source: "/run/archiso/bootmnt/arch/boot/amd-ucode.img"
+        sourcefs: "file"
+        destination: "/boot/amd-ucode.img"
+    -   source: "/run/archiso/bootmnt/arch/boot/intel-ucode.img"
+        sourcefs: "file"
+        destination: "/boot/intel-ucode.img"