mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
added advanced root detection if root= was specified
This commit is contained in:
parent
bfb5a7fc82
commit
53f420ae16
12 changed files with 223 additions and 176 deletions
|
@ -9,7 +9,7 @@ FILES=""
|
||||||
#
|
#
|
||||||
# Please change the other hooks only if you know what you are doing.
|
# Please change the other hooks only if you know what you are doing.
|
||||||
# hooks for lowmem image
|
# hooks for lowmem image
|
||||||
HOOKS="arch_core_install arch_installer arch_bootmessage_allinone arch_acpi arch_motd arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata usb arch_cdrom arch_pcspkr usbinput arch_virtio arch_dmraid arch_mdadm arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses"
|
HOOKS="arch_core_install arch_installer arch_bootmessage_allinone arch_acpi arch_motd arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata usb arch_cdrom arch_pcspkr usbinput arch_virtio arch_dmraid arch_advanced_root arch_mdadm arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses"
|
||||||
|
|
||||||
### NETWORK SETUP
|
### NETWORK SETUP
|
||||||
# the default install media creating process, uses latest files from svn!
|
# the default install media creating process, uses latest files from svn!
|
||||||
|
|
|
@ -8,7 +8,7 @@ FILES=""
|
||||||
# SETUP
|
# SETUP
|
||||||
#
|
#
|
||||||
# Please change the hooks only if you know what you are doing.
|
# Please change the hooks only if you know what you are doing.
|
||||||
HOOKS="arch_ftp_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap arch_acpi arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_clamav"
|
HOOKS="arch_ftp_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap arch_acpi arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_advanced_root arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_clamav"
|
||||||
|
|
||||||
### NETWORK SETUP
|
### NETWORK SETUP
|
||||||
# the default install media creating process, uses latest files from svn!
|
# the default install media creating process, uses latest files from svn!
|
||||||
|
|
|
@ -8,7 +8,7 @@ FILES=""
|
||||||
# SETUP
|
# SETUP
|
||||||
#
|
#
|
||||||
# Please change the hooks only if you know what you are doing.
|
# Please change the hooks only if you know what you are doing.
|
||||||
HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_pxelinux"
|
HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_advanced_root arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_pxelinux"
|
||||||
|
|
||||||
### NETWORK SETUP
|
### NETWORK SETUP
|
||||||
# the default install media creating process, uses latest files from svn!
|
# the default install media creating process, uses latest files from svn!
|
||||||
|
|
|
@ -8,7 +8,7 @@ FILES=""
|
||||||
# SETUP
|
# SETUP
|
||||||
#
|
#
|
||||||
# Please change the hooks only if you know what you are doing.
|
# Please change the hooks only if you know what you are doing.
|
||||||
HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_clamav"
|
HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_advanced_root arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_clamav"
|
||||||
|
|
||||||
### NETWORK SETUP
|
### NETWORK SETUP
|
||||||
# the default install media creating process, uses latest files from svn!
|
# the default install media creating process, uses latest files from svn!
|
||||||
|
|
|
@ -8,7 +8,7 @@ FILES=""
|
||||||
# SETUP
|
# SETUP
|
||||||
#
|
#
|
||||||
# Please change the hooks only if you know what you are doing.
|
# Please change the hooks only if you know what you are doing.
|
||||||
HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_pxelinux arch_wipe arch_testdisk arch_ddrescue arch_clamav"
|
HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_advanced_root arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_addons arch_vim arch_pxelinux arch_wipe arch_testdisk arch_ddrescue arch_clamav"
|
||||||
|
|
||||||
### NETWORK SETUP
|
### NETWORK SETUP
|
||||||
# the default install media creating process, uses latest files from svn!
|
# the default install media creating process, uses latest files from svn!
|
||||||
|
|
|
@ -8,7 +8,7 @@ FILES=""
|
||||||
# SETUP
|
# SETUP
|
||||||
#
|
#
|
||||||
# Please change the hooks only if you know what you are doing.
|
# Please change the hooks only if you know what you are doing.
|
||||||
HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_vim arch_addons arch_wipe arch_testdisk arch_ddrescue arch_clamav"
|
HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_virtio arch_dmraid arch_advanced_root arch_mdadm arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_syslinux arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_fsarchiver arch_vim arch_addons arch_wipe arch_testdisk arch_ddrescue arch_clamav"
|
||||||
|
|
||||||
### NETWORK SETUP
|
### NETWORK SETUP
|
||||||
# the default install media creating process, uses latest files from svn!
|
# the default install media creating process, uses latest files from svn!
|
||||||
|
|
|
@ -9,7 +9,7 @@ FILES=""
|
||||||
#
|
#
|
||||||
# Please change the hooks only if you know what you are doing.
|
# Please change the hooks only if you know what you are doing.
|
||||||
# hooks for lowmem image
|
# hooks for lowmem image
|
||||||
HOOKS="arch_core_install arch_installer arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata usb arch_cdrom arch_pcspkr usbinput arch_virtio arch_dmraid arch_mdadm arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses"
|
HOOKS="arch_core_install arch_installer arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata usb arch_cdrom arch_pcspkr usbinput arch_virtio arch_dmraid arch_advanced_root arch_mdadm arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses"
|
||||||
|
|
||||||
### NETWORK SETUP
|
### NETWORK SETUP
|
||||||
# the default install media creating process, uses latest files from svn!
|
# the default install media creating process, uses latest files from svn!
|
||||||
|
|
24
lib/initcpio/hooks/arch_advanced_root
Normal file
24
lib/initcpio/hooks/arch_advanced_root
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
# vim: set ft=sh:
|
||||||
|
run_hook ()
|
||||||
|
{
|
||||||
|
if ! [ "${root}" = "" -a "${ip}" = "" ]; then
|
||||||
|
HOOKS="$(hwdetect --rootdevice=${root} --advanced)"
|
||||||
|
echo $HOOKS | grep -q lvm && export LVMRUN=1
|
||||||
|
echo $HOOKS | grep -q mdadm && export MDADMRUN=1
|
||||||
|
echo $HOOKS | grep -q encrypt && export ENCRYPTRUN=1
|
||||||
|
if [ -e "/hooks" ]; then
|
||||||
|
for h in ${HOOKS}; do
|
||||||
|
TST=""
|
||||||
|
eval "TST=\$hook_${h}"
|
||||||
|
if [ "${TST}" != "disabled" ]; then
|
||||||
|
run_hook () { msg "${h}: no run function defined"; }
|
||||||
|
if [ -e "/hooks/${h}" ]; then
|
||||||
|
. /hooks/${h}
|
||||||
|
msg ":: Running Hook [${h}]"
|
||||||
|
run_hook
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
|
@ -3,6 +3,7 @@
|
||||||
# encryption schemes
|
# encryption schemes
|
||||||
run_hook ()
|
run_hook ()
|
||||||
{
|
{
|
||||||
|
if [ "$ENCRYPTRUN" = "1" ]; then
|
||||||
/sbin/modprobe -a -q dm-crypt >/dev/null 2>&1
|
/sbin/modprobe -a -q dm-crypt >/dev/null 2>&1
|
||||||
if [ -e "/sys/class/misc/device-mapper" ]; then
|
if [ -e "/sys/class/misc/device-mapper" ]; then
|
||||||
if [ ! -c "/dev/mapper/control" ]; then
|
if [ ! -c "/dev/mapper/control" ]; then
|
||||||
|
@ -126,4 +127,5 @@ run_hook ()
|
||||||
fi
|
fi
|
||||||
nuke ${ckeyfile}
|
nuke ${ckeyfile}
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
run_hook ()
|
run_hook ()
|
||||||
{
|
{
|
||||||
|
if ! [ "$LVMRUN" = "1" ]; then
|
||||||
/sbin/modprobe -q dm-mod >/dev/null 2>&1
|
/sbin/modprobe -q dm-mod >/dev/null 2>&1
|
||||||
# fix if udev initialises /dev/mapper/control
|
# fix if udev initialises /dev/mapper/control
|
||||||
sleep 0.5
|
sleep 0.5
|
||||||
|
@ -15,4 +16,5 @@ run_hook ()
|
||||||
msg "Activating logical volumes..."
|
msg "Activating logical volumes..."
|
||||||
/sbin/lvm vgchange --ignorelockingfailure -ay
|
/sbin/lvm vgchange --ignorelockingfailure -ay
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
# vim: set ft=sh:
|
# vim: set ft=sh:
|
||||||
run_hook ()
|
run_hook ()
|
||||||
{
|
{
|
||||||
|
if ! [ "$MDADMRUN" = "1" ]; then
|
||||||
input="$(cat /proc/cmdline)"
|
input="$(cat /proc/cmdline)"
|
||||||
mdconfig="/etc/mdadm.conf"
|
mdconfig="/etc/mdadm.conf"
|
||||||
# for partitionable raid, we need to load md_mod first!
|
# for partitionable raid, we need to load md_mod first!
|
||||||
|
@ -49,4 +50,5 @@ run_hook ()
|
||||||
# assemble everything
|
# assemble everything
|
||||||
/sbin/mdassemble.static
|
/sbin/mdassemble.static
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
}
|
}
|
17
lib/initcpio/install/arch_advanced_root
Normal file
17
lib/initcpio/install/arch_advanced_root
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
# vim:set ft=sh:
|
||||||
|
|
||||||
|
install ()
|
||||||
|
{
|
||||||
|
MODULES=""
|
||||||
|
BINARIES="hwdetect"
|
||||||
|
FILES=""
|
||||||
|
SCRIPT="arch_advanced_root"
|
||||||
|
}
|
||||||
|
|
||||||
|
help ()
|
||||||
|
{
|
||||||
|
cat <<HELPEOF
|
||||||
|
This hook will use hwdetect to detect the needed
|
||||||
|
advanced hooks for your system.
|
||||||
|
HELPEOF
|
||||||
|
}
|
Loading…
Reference in a new issue