Compare commits

..

No commits in common. "901c28690219807c83b0ee6c0bbb5755ebf75598" and "3c24a6c200755b90adde605d9d01aeda7be081e0" have entirely different histories.

7 changed files with 35 additions and 39 deletions

15
.github/FUNDING.yml vendored Executable file
View File

@ -0,0 +1,15 @@
# 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"]

View File

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

View File

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

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -e
function usage {
echo "$(basename "$0") [OPTIONS]"
@ -17,6 +17,8 @@ if [[ ${#} -eq 0 ]]; then
usage
fi
declare -a ukify_global_args=()
ESP_PATH=$(bootctl --print-esp-path)
if [ -z "$ESP_PATH" ]; then
exit 1
@ -37,8 +39,6 @@ else
fi
BOOT_PATH="/boot"
declare -A kernels
update_all=0
@ -79,19 +79,17 @@ 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+=("$initrd_image_fallback_terminal")
images+=($kernel_image)
images+=($initrd_image)
images+=($initrd_image_fallback)
for image in "${images[@]}";
do
if [ -f "$image" ]; then
if [ -f ]; then
echo "==> Removing $image..."
rm -f "$image"
rm -f $image
fi
done
fi
@ -123,7 +121,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")
@ -142,46 +140,30 @@ 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" | tr '[:space:]' ' ' | tr -s ' ')
cmdline=$(sed -e 's/^[[:space:]]//g' -e 's/[[:space:]]$//g' "/etc/kernel/cmdline")
elif [ -f "/boot/refind_linux.conf" ]; then
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')
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')
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" "$initrd_image"
dracut --force --hostonly --no-hostonly-i18n --early-microcode --kernel-cmdline="$cmdline" --kver "$kernel_version" "$BOOT_PATH/initramfs-$kernel_name.img"
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" "$initrd_image_fallback"
dracut --force --no-hostonly --no-hostonly-i18n --early-microcode --kernel-cmdline="$cmdline" --kver "$kernel_version" "$BOOT_PATH/initramfs-$kernel_name-fallback.img"
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"
cp -vrf $vmlinuz $kernel_image
}
for kernel_name in "${!kernels[@]}"; do

View File

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

View File

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

View File

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