Update

.github/FUNDING.yml

@@ -1,15 +0,0 @@
-# These are supported funding model platforms
-
-#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-
-#patreon: # Replace with a single Patreon username
-#open_collective: # Replace with a single Open Collective username
-#ko_fi: # Replace with a single Ko-fi username
-#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-#liberapay: # Replace with a single Liberapay username
-#issuehunt: # Replace with a single IssueHunt username
-#otechie: # Replace with a single Otechie username
-#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
-#github: [Valeria-Fadeeva]
-custom: ["https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066", "https://yoomoney.ru/to/4100115921160758", "https://qiwi.com/n/VALERIAFADEEVA", "valeria.fadeeva.me"]

README.md

@@ -17,6 +17,4 @@ vmlinuz-linux-xanmod-anbox
 
 [YooMoney](https://yoomoney.ru/to/4100115921160758)
 
-[Qiwi](https://qiwi.com/n/VALERIAFADEEVA)
-
 Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f

push.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
 
-git add . && git commit -m "Update" && git push
+git add . && git commit -m "Update"
+git push
+
+echo "Ready"

usr/bin/dracut-initramfs

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash
 
 function usage {
   echo "$(basename "$0") [OPTIONS]"
@@ -17,8 +17,6 @@ if [[ ${#} -eq 0 ]]; then
    usage
 fi
 
-declare -a ukify_global_args=()
-
 ESP_PATH=$(bootctl --print-esp-path)
 if [ -z "$ESP_PATH" ]; then
   exit 1
@@ -39,6 +37,8 @@ else
 
 fi
 
+BOOT_PATH="/boot"
+
 declare -A kernels
 update_all=0
 
@@ -79,17 +79,19 @@ while getopts ":hag:xyz" arg; do
           kernel_image="$BOOT_PATH/vmlinuz-$kernel_name"
           initrd_image="$BOOT_PATH/initramfs-$kernel_name.img"
           initrd_image_fallback="$BOOT_PATH/initramfs-$kernel_name-fallback.img"
+          initrd_image_fallback_terminal="$BOOT_PATH/initramfs-$kernel_name-fallback-terminal.img"
 
           declare -a images=()
-          images+=($kernel_image)
-          images+=($initrd_image)
-          images+=($initrd_image_fallback)
+          images+=("$kernel_image")
+          images+=("$initrd_image")
+          images+=("$initrd_image_fallback")
+          images+=("$initrd_image_fallback_terminal")
 
           for image in "${images[@]}";
           do
-            if [ -f ]; then
+            if [ -f "$image" ]; then
               echo "==> Removing $image..."
-              rm -f $image
+              rm -f "$image"
             fi
           done
         fi
@@ -121,7 +123,7 @@ if (( update_all )); then
   for kernel_path in /usr/lib/modules/*; do
     [ -f "$kernel_path/pkgbase" ] || continue
 
-    kernel_version=$(basename $kernel_path)
+    kernel_version=$(basename "$kernel_path")
     kernel_dir="/usr/lib/modules/$kernel_version"
     pkgbase="$kernel_dir/pkgbase"
     kernel_name=$(sed -e 's/^[[:space:]]//g' -e 's/[[:space:]]$//g' "$pkgbase")
@@ -140,30 +142,46 @@ function gen_image() {
   kernel_dir="/usr/lib/modules/$kernel_version"
 
   if [ -f "/etc/kernel/cmdline" ]; then
-    cmdline=$(sed -e 's/^[[:space:]]//g' -e 's/[[:space:]]$//g' "/etc/kernel/cmdline")
+    cmdline=$(sed -e 's/^[[:space:]]//g' -e 's/[[:space:]]$//g' "/etc/kernel/cmdline" | tr '[:space:]' ' ' | tr -s ' ')
+
   elif [ -f "/boot/refind_linux.conf" ]; then
-    cmdline=$(cat "/boot/refind_linux.conf" | head -n 1 | sed -e 's|"Boot with standard options"||g' | awk '{$1=$1;print}' | sed -e 's/"//g')
+      cmdline=$(head -n 1 < "/boot/refind_linux.conf" | sed -e 's|"Boot with standard options"||g' | awk '{$1=$1;print}' | sed -e 's/"//g')
+
+  elif [ -f "/efi/refind_linux.conf" ]; then
+      cmdline=$(head -n 1 < "/efi/refind_linux.conf" | sed -e 's|"Boot with standard options"||g' | awk '{$1=$1;print}' | sed -e 's/"//g')
+
+  elif [ -f "/boot/efi/refind_linux.conf" ]; then
+      cmdline=$(head -n 1 < "/boot/efi/refind_linux.conf" | sed -e 's|"Boot with standard options"||g' | awk '{$1=$1;print}' | sed -e 's/"//g')
+
   else
     cmdline=$(sed -e 's/^[[:space:]]//g' -e 's/[[:space:]]$//g' -e 's/initrd.*$//g' "/proc/cmdline")
   fi
 
+  cmdline_terminal="$cmdline systemd.unit=multi-user.target"
+
   vmlinuz="$kernel_dir/vmlinuz"
   kernel_image="$BOOT_PATH/vmlinuz-$kernel_name"
 
   initrd_image="$BOOT_PATH/initramfs-$kernel_name.img"
   initrd_image_fallback="$BOOT_PATH/initramfs-$kernel_name-fallback.img"
+  initrd_image_fallback_terminal="$BOOT_PATH/initramfs-$kernel_name-fallback-terminal.img"
 
   echo "==> Building initrd image $kernel_name $initrd_image"
   #dracut --force --hostonly --kver "$kernel_version" --kernel-cmdline="$cmdline" "$BOOT_PATH/initramfs-$kernel_name.img"
   #dracut --force --hostonly --no-hostonly-cmdline --kver "$kernel_version" "$BOOT_PATH/initramfs-$kernel_name.img"
-  dracut --force --hostonly --no-hostonly-i18n --early-microcode --kernel-cmdline="$cmdline" --kver "$kernel_version" "$BOOT_PATH/initramfs-$kernel_name.img"
+  dracut --force --hostonly --no-hostonly-i18n --early-microcode --kernel-cmdline="$cmdline" --kver "$kernel_version" "$initrd_image"
 
   echo "==> Building initrd image $kernel_name $initrd_image_fallback"
   #dracut --force --no-hostonly --kver "$kernel_version" --kernel-cmdline="$cmdline" "$BOOT_PATH/initramfs-$kernel_name-fallback.img"
   #dracut --force --kver "$kernel_version" "$BOOT_PATH/initramfs-$kernel_name-fallback.img"
-  dracut --force --no-hostonly --no-hostonly-i18n --early-microcode --kernel-cmdline="$cmdline" --kver "$kernel_version" "$BOOT_PATH/initramfs-$kernel_name-fallback.img"
+  dracut --force --no-hostonly --no-hostonly-i18n --early-microcode --kernel-cmdline="$cmdline" --kver "$kernel_version" "$initrd_image_fallback"
 
-  cp -vrf $vmlinuz $kernel_image
+  echo "==> Building initrd image $kernel_name $initrd_image_fallback_terminal TERMINAL"
+  #dracut --force --no-hostonly --kver "$kernel_version" --kernel-cmdline="$cmdline" "$BOOT_PATH/initramfs-$kernel_name-fallback.img"
+  #dracut --force --kver "$kernel_version" "$BOOT_PATH/initramfs-$kernel_name-fallback.img"
+  dracut --force --no-hostonly --no-hostonly-i18n --early-microcode --kernel-cmdline="$cmdline_terminal" --kver "$kernel_version" "$initrd_image_fallback_terminal"
+
+  cp -vrf "$vmlinuz" "$kernel_image"
 }
 
 for kernel_name in "${!kernels[@]}"; do

usr/share/libalpm/hooks/10-dracut-initramfs-pre-install.hook

@@ -12,4 +12,4 @@ Target = usr/src/*/dkms.conf
 [Action]
 Description = Ensure ESP is mounted...
 When = PreTransaction
-Exec = /usr/bin/dracut-initramfs -x
+Exec = /bin/sh -c "/usr/bin/dracut-initramfs -x"

usr/share/libalpm/hooks/60-dracut-initramfs-remove.hook

@@ -7,5 +7,5 @@ Target = usr/src/*/dkms.conf
 [Action]
 Description = Removing linux images...
 When = PreTransaction
-Exec = /usr/bin/dracut-initramfs -y
+Exec = /bin/sh -c "/usr/bin/dracut-initramfs -y"
 NeedsTargets

usr/share/libalpm/hooks/90-dracut-initramfs-install.hook

@@ -12,5 +12,5 @@ Target = usr/src/*/dkms.conf
 [Action]
 Description = Updating linux images...
 When = PostTransaction
-Exec = /usr/bin/dracut-initramfs -z
+Exec = /bin/sh -c "/usr/bin/dracut-initramfs -z"
 NeedsTargets