root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Keshav: Fix errors encountered during generation of initramfs

Browse source
This commit is contained in:
Tobias Powalowski 2013-09-16 16:45:02 +02:00
parent d7a7774544
commit 2af5e3377a
5 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/archboot/default.conf
View file

@ -17,7 +17,7 @@ arch_filesystems arch_remote arch_cpufreq arch_links arch_kexec arch_ppp arch_xl
arch_pppoe arch_grub arch_refind arch_gummiboot arch_efibootmgr arch_syslinux arch_iptables arch_pciutils \ arch_pppoe arch_grub arch_refind arch_gummiboot arch_efibootmgr arch_syslinux arch_iptables arch_pciutils \
arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_smartmontools arch_licenses arch_wireless \ arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_smartmontools arch_licenses arch_wireless \
arch_wireless_staging arch_linux_atm arch_netctl arch_fsarchiver arch_vim arch_wipe \ arch_wireless_staging arch_linux_atm arch_netctl arch_fsarchiver arch_vim arch_wipe \
arch_testdisk arch_ddrescue arch_chntpw arch_platform arch_dmidecide arch_wiki_lite \ arch_testdisk arch_ddrescue arch_chntpw arch_platform arch_dmidecode arch_wiki_lite \
arch_intel_ucode arch_wvdial arch_usb_modeswitch \ arch_intel_ucode arch_wvdial arch_usb_modeswitch \
arch_lockdown-ms arch_prebootloader arch_efivar net" arch_lockdown-ms arch_prebootloader arch_efivar net"

21
usr/lib/initcpio/install/arch_base
View file

@ -42,8 +42,11 @@ build ()
/usr/bin/lzma /usr/bin/modinfo /usr/bin/modprobe /usr/bin/nc /usr/bin/reset /usr/bin/rmmod \ /usr/bin/lzma /usr/bin/modinfo /usr/bin/modprobe /usr/bin/nc /usr/bin/reset /usr/bin/rmmod \
/usr/bin/unlzma /usr/bin/unxz /usr/bin/xzcat /usr/bin/lastb /usr/bin/sh" /usr/bin/unlzma /usr/bin/unxz /usr/bin/xzcat /usr/bin/lastb /usr/bin/sh"
for i in $symlinks; do for i in $symlinks; do
add_binary "$(which $(basename $(readlink "$i")))" echo "Checking $i"
add_symlink "$i" "$(which $(basename $(readlink "$i")))" # if [ -e $i ]; then
add_binary "$(which "$(basename "$(readlink "$i")")")"
add_symlink "$i" "$(which "$(basename "$(readlink "$i")")")"
# fi
done done
add_symlink "/usr/bin/init" "/usr/lib/systemd/systemd" add_symlink "/usr/bin/init" "/usr/lib/systemd/systemd"
add_symlink "/init" "/usr/lib/systemd/systemd" add_symlink "/init" "/usr/lib/systemd/systemd"
@ -103,8 +106,11 @@ build ()
done done
symlinks="/usr/bin/vigr" symlinks="/usr/bin/vigr"
for i in $symlinks; do for i in $symlinks; do
add_binary "$(which $(basename $(readlink "$i")))" echo "Checking $i"
add_symlink "$i" "$(which $(basename $(readlink "$i")))" # if [ -e $i ]; then
add_binary "$(which "$(basename "$(readlink "$i")")")"
add_symlink "$i" "$(which "$(basename "$(readlink "$i")")")"
# fi
done done
add_file "/etc/login.defs" add_file "/etc/login.defs"
@ -171,8 +177,11 @@ build ()
done done
symlinks="/usr/bin/gpg /usr/bin/repo-remove" symlinks="/usr/bin/gpg /usr/bin/repo-remove"
for i in $symlinks; do for i in $symlinks; do
add_binary "$(which $(basename $(readlink "$i")))" echo "Checking $i"
add_symlink "$i" "$(which $(basename $(readlink "$i")))" # if [ -e $i ]; then
add_binary "$(which "$(basename "$(readlink "$i")")")"
add_symlink "$i" "$(which "$(basename "$(readlink "$i")")")"
# fi
done done
add_dir "/var/cache/pacman/pkg" add_dir "/var/cache/pacman/pkg"
add_dir "/var/lib/pacman" add_dir "/var/lib/pacman"

7
usr/lib/initcpio/install/arch_bootmessage
View file

@ -3,6 +3,13 @@
build () build ()
{ {
# [ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
# [ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
# [ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
# [ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
### generate boot.msg ### generate boot.msg
[ "${RUNPROGRAM}" = "mkisolinux" ] && TITLEMSG="ISOLINUX" [ "${RUNPROGRAM}" = "mkisolinux" ] && TITLEMSG="ISOLINUX"
[ "${RUNPROGRAM}" = "mksyslinux" ] && TITLEMSG="SYSLINUX" [ "${RUNPROGRAM}" = "mksyslinux" ] && TITLEMSG="SYSLINUX"

8
usr/lib/initcpio/install/arch_memtest
View file

@ -3,10 +3,10 @@
build () build ()
{ {
[ ${RUNPROGRAM} = "mkisolinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest" [ "${RUNPROGRAM}" = "mkisolinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"
[ ${RUNPROGRAM} = "archboot-tarball-helper.sh" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest" [ "${RUNPROGRAM}" = "archboot-tarball-helper.sh" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"
[ ${RUNPROGRAM} = "mksyslinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest" [ "${RUNPROGRAM}" = "mksyslinux" ] && cp "/boot/memtest86+/memtest.bin" "${TEMPDIR}/boot/memtest"
[ ${RUNPROGRAM} = "mkpxelinux" ] && cp "/boot/memtest86+/memtest.bin" "${INSTALLDIR}/memtest" [ "${RUNPROGRAM}" = "mkpxelinux" ] && cp "/boot/memtest86+/memtest.bin" "${INSTALLDIR}/memtest"
} }
help () help ()

2
usr/lib/initcpio/install/arch_network_install
View file

@ -10,7 +10,7 @@ build ()
fi fi
### check for TEMPDIR ### check for TEMPDIR
if [ $TEMPDIR = "" ]; then if [ "$TEMPDIR" = "" ]; then
echo "ERROR: No TEMPDIR was set, please set TEMPDIR first!" echo "ERROR: No TEMPDIR was set, please set TEMPDIR first!"
exit 1 exit 1
fi fi