From 557cd0c1895dce741134fd9e11ecfe9dcf6a3fc8 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sun, 26 Apr 2009 11:49:11 +0200 Subject: [PATCH] 'added syslinux to generation' --- etc/archboot/allinone.conf | 2 +- etc/archboot/default-ftp-pxelinux.conf | 2 +- etc/archboot/default-ftp.conf | 2 +- etc/archboot/default-pxelinux.conf | 2 +- etc/archboot/default.conf | 2 +- lib/initcpio/install/arch_syslinux | 17 +++++++++++++++++ 6 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 lib/initcpio/install/arch_syslinux diff --git a/etc/archboot/allinone.conf b/etc/archboot/allinone.conf index 566f1e0b8..3a2a07983 100644 --- a/etc/archboot/allinone.conf +++ b/etc/archboot/allinone.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # 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_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_addons" +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_addons" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-ftp-pxelinux.conf b/etc/archboot/default-ftp-pxelinux.conf index e663b39a5..e9735b5e7 100644 --- a/etc/archboot/default-ftp-pxelinux.conf +++ b/etc/archboot/default-ftp-pxelinux.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # 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_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_addons 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_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_addons arch_pxelinux" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-ftp.conf b/etc/archboot/default-ftp.conf index 9de12eb63..f93aef015 100644 --- a/etc/archboot/default-ftp.conf +++ b/etc/archboot/default-ftp.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # 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_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_addons" +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_addons" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-pxelinux.conf b/etc/archboot/default-pxelinux.conf index 6f4770889..b87f3cd6c 100644 --- a/etc/archboot/default-pxelinux.conf +++ b/etc/archboot/default-pxelinux.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # 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_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_addons arch_pxelinux" +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_addons arch_pxelinux" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default.conf b/etc/archboot/default.conf index b644d912d..c0946e5ad 100644 --- a/etc/archboot/default.conf +++ b/etc/archboot/default.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # 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_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_addons" +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_addons" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/lib/initcpio/install/arch_syslinux b/lib/initcpio/install/arch_syslinux new file mode 100644 index 000000000..dc98c7513 --- /dev/null +++ b/lib/initcpio/install/arch_syslinux @@ -0,0 +1,17 @@ +# Created by Tobias Powalowski + +install () +{ + MODULES="" + BINARIES="syslinux" + FILES="" + SCRIPT="" + add_file "/usr/lib/syslinux/mbr.bin" +} + +help () +{ +cat<