mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
merge grub files
This commit is contained in:
parent
761a1a46c8
commit
a768a0b613
4 changed files with 14 additions and 39 deletions
|
@ -15,9 +15,9 @@ archboot_acpi archboot_motd \
|
||||||
archboot_hwdetect block archboot_net \
|
archboot_hwdetect block archboot_net \
|
||||||
keyboard dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 \
|
keyboard dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 \
|
||||||
encrypt btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp archboot_xl2tpd \
|
encrypt btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp archboot_xl2tpd \
|
||||||
archboot_pppoe archboot_grub_arm archboot_efibootmgr archboot_iptables archboot_pciutils archboot_usbutils \
|
archboot_pppoe archboot_grub archboot_efibootmgr archboot_iptables archboot_pciutils archboot_usbutils \
|
||||||
archboot_openvpn archboot_vpnc archboot_pptpclient archboot_smartmontools archboot_licenses archboot_wireless_arm archboot_wireless_staging \
|
archboot_openvpn archboot_vpnc archboot_pptpclient archboot_smartmontools archboot_licenses archboot_wireless_arm archboot_wireless_staging \
|
||||||
archboot_linux_atm archboot_netctl archboot_fsarchiver archboot_vim_arm archboot_wipe archboot_testdisk archboot_ddrescue \
|
archboot_linux_atm archboot_netctl archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \
|
||||||
archboot_nmap archboot_tcpdump archboot_openconnect archboot_dnsmasq archboot_platform \
|
archboot_nmap archboot_tcpdump archboot_openconnect archboot_dnsmasq archboot_platform \
|
||||||
archboot_hypervisor archboot_amd_ucode archboot_wvdial \
|
archboot_hypervisor archboot_amd_ucode archboot_wvdial \
|
||||||
archboot_usb_modeswitch archboot_secure_boot_arm archboot_efivar archboot_lshw)
|
archboot_usb_modeswitch archboot_secure_boot_arm archboot_efivar archboot_lshw)
|
||||||
|
|
|
@ -24,11 +24,18 @@ build ()
|
||||||
add_file "$i"
|
add_file "$i"
|
||||||
done
|
done
|
||||||
|
|
||||||
# add bios and x86_64-efi files
|
if [[ "$(uname -m)" == "x86_64" ]]; then
|
||||||
# i386 efi is very rare. They are only used in old Macs,
|
# add bios and x86_64-efi files
|
||||||
# in which the kernel itself has issues booting in EFI mode
|
# i386 efi is very rare. They are only used in old Macs,
|
||||||
add_full_dir /usr/lib/grub/i386-pc
|
# in which the kernel itself has issues booting in EFI mode
|
||||||
add_full_dir /usr/lib/grub/x86_64-efi
|
add_full_dir /usr/lib/grub/i386-pc
|
||||||
|
add_full_dir /usr/lib/grub/x86_64-efi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$(uname -m)" == "aarch64" ]]; then
|
||||||
|
# add aarch64 arm64-efi files
|
||||||
|
add_full_dir /usr/lib/grub/arm64-efi
|
||||||
|
fi
|
||||||
|
|
||||||
## add grub(2) unicode font file
|
## add grub(2) unicode font file
|
||||||
add_file "/usr/share/grub/unicode.pf2"
|
add_file "/usr/share/grub/unicode.pf2"
|
||||||
|
|
|
@ -19,7 +19,6 @@ build ()
|
||||||
done
|
done
|
||||||
# fix colors
|
# fix colors
|
||||||
[[ -e "/usr/share/vim/vim82/colors/lists/default.vim" ]] && add_file "/usr/share/vim/vim82/colors/lists/default.vim"
|
[[ -e "/usr/share/vim/vim82/colors/lists/default.vim" ]] && add_file "/usr/share/vim/vim82/colors/lists/default.vim"
|
||||||
add_file "/usr/share/vim/vim82/rgb.txt"
|
|
||||||
add_file "/usr/share/licenses/vim/license.txt"
|
add_file "/usr/share/licenses/vim/license.txt"
|
||||||
add_full_dir "/usr/share/vim/vim82/autoload/dist"
|
add_full_dir "/usr/share/vim/vim82/autoload/dist"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Created by Tobias Powalowski <tpowa@archlinux.org>
|
|
||||||
|
|
||||||
build ()
|
|
||||||
{
|
|
||||||
add_binary "vim"
|
|
||||||
add_file "/etc/vimrc"
|
|
||||||
# fix vi symlink
|
|
||||||
add_symlink "/usr/bin/vi" "/usr/bin/vim"
|
|
||||||
add_file "/usr/share/vim/vimfiles/archlinux.vim"
|
|
||||||
VIM_MODULE="syntax conf dosini sh grub manual synload colortest syncolor hitest whitespace nosyntax resolv fstab bash zsh exports passwd sysctl systemd vim"
|
|
||||||
for i in ${VIM_MODULE}; do
|
|
||||||
[[ -e "/usr/share/vim/vim82/syntax/$i.vim" ]] && add_file "/usr/share/vim/vim82/syntax/$i.vim"
|
|
||||||
[[ -e "/usr/share/vim/vim82/indent/$i.vim" ]] && add_file "/usr/share/vim/vim82/indent/$i.vim"
|
|
||||||
done
|
|
||||||
VIM_BASIC_MODULE="defaults filetype indent indoff menu scripts synmenu"
|
|
||||||
for i in ${VIM_BASIC_MODULE}; do
|
|
||||||
[[ -e "/usr/share/vim/vim82/$i.vim" ]] && add_file "/usr/share/vim/vim82/$i.vim"
|
|
||||||
done
|
|
||||||
# fix colors
|
|
||||||
[[ -e "/usr/share/vim/vim82/colors/lists/default.vim" ]] && add_file "/usr/share/vim/vim82/colors/lists/default.vim"
|
|
||||||
add_file "/usr/share/licenses/vim/license.txt"
|
|
||||||
add_full_dir "/usr/share/vim/vim82/autoload/dist"
|
|
||||||
}
|
|
||||||
|
|
||||||
help ()
|
|
||||||
{
|
|
||||||
cat<<HELPEOF
|
|
||||||
This hook includes small version of vim on an archboot image.
|
|
||||||
HELPEOF
|
|
||||||
}
|
|
Loading…
Reference in a new issue