diff --git a/etc/archboot/allinone-lts.conf b/etc/archboot/allinone-lts.conf index 71c47c659..2a3c9b095 100644 --- a/etc/archboot/allinone-lts.conf +++ b/etc/archboot/allinone-lts.conf @@ -10,7 +10,7 @@ FILES="" # Please change the hooks only if you know what you are doing. HOOKS="arch_fb arch_ide_blacklist arch_base arch_core_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap \ arch_acpi arch_motd arch_memtest arch_intel_wireless \ -arch_linux_firmware arch_hwdetect ide pata scsi sata arch_cdrom \ +arch_linux_firmware arch_hwdetect ide pata scsi sata memdisk arch_cdrom \ arch_pcspkr arch_net arch_isdn pcmcia arch_sound usb usbinput arch_fw arch_virtio dmraid \ arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt btrfs arch_filesystems arch_remote \ arch_cpufreq arch_links arch_kexec arch_ppp arch_pppoe arch_xl2tpd arch_grub arch_efibootmgr \ diff --git a/etc/archboot/allinone.conf b/etc/archboot/allinone.conf index 166aade1e..e08acdcb8 100644 --- a/etc/archboot/allinone.conf +++ b/etc/archboot/allinone.conf @@ -10,7 +10,7 @@ FILES="" # Please change the hooks only if you know what you are doing. HOOKS="arch_fb arch_base arch_ftp_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap \ arch_acpi arch_motd arch_memtest arch_linux_firmware arch_intel_wireless \ -arch_hwdetect pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn pcmcia \ +arch_hwdetect pata scsi sata memdisk arch_cdrom arch_pcspkr arch_net arch_isdn pcmcia \ arch_sound usb usbinput arch_fw arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 \ arch_encrypt btrfs arch_filesystems arch_remote arch_cpufreq arch_links arch_kexec arch_ppp arch_xl2tpd \ arch_pppoe arch_lilo arch_grub arch_efibootmgr arch_syslinux arch_iptables arch_pciutils arch_usbutils \ diff --git a/etc/archboot/default-ftp-pxelinux.conf b/etc/archboot/default-ftp-pxelinux.conf index 1916f35d4..9176117e9 100644 --- a/etc/archboot/default-ftp-pxelinux.conf +++ b/etc/archboot/default-ftp-pxelinux.conf @@ -10,7 +10,7 @@ FILES="" # Please change the hooks only if you know what you are doing. HOOKS="arch_fb arch_base arch_ftp_install arch_installer arch_tz arch_keymap \ arch_acpi arch_bootmessage arch_motd arch_memtest \ -arch_linux_firmware arch_intel_wireless arch_hwdetect pata scsi sata arch_cdrom \ +arch_linux_firmware arch_intel_wireless arch_hwdetect pata scsi sata memdisk arch_cdrom \ arch_pcspkr arch_net arch_isdn pcmcia arch_sound usb usbinput arch_fw \ arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt btrfs \ arch_filesystems arch_remote arch_cpufreq arch_links arch_kexec arch_ppp arch_xl2tpd arch_pppoe \ diff --git a/etc/archboot/default-ftp.conf b/etc/archboot/default-ftp.conf index d65f77667..5b0a2fc96 100644 --- a/etc/archboot/default-ftp.conf +++ b/etc/archboot/default-ftp.conf @@ -10,7 +10,7 @@ FILES="" # Please change the hooks only if you know what you are doing. HOOKS="arch_fb arch_base arch_ftp_install arch_installer arch_tz arch_keymap \ arch_acpi arch_bootmessage arch_motd arch_memtest \ -arch_linux_firmware arch_intel_wireless arch_hwdetect pata scsi sata arch_cdrom \ +arch_linux_firmware arch_intel_wireless arch_hwdetect pata scsi sata memdisk arch_cdrom \ arch_pcspkr arch_net arch_isdn pcmcia arch_sound usb usbinput arch_fw \ arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt \ btrfs arch_filesystems arch_remote arch_cpufreq arch_links arch_kexec arch_ppp arch_xl2tpd \ diff --git a/etc/archboot/default-pxelinux.conf b/etc/archboot/default-pxelinux.conf index 5767aefff..462ae3711 100644 --- a/etc/archboot/default-pxelinux.conf +++ b/etc/archboot/default-pxelinux.conf @@ -10,7 +10,7 @@ FILES="" # Please change the hooks only if you know what you are doing. HOOKS="arch_fb arch_base arch_core_install arch_installer arch_tz arch_keymap \ arch_acpi arch_bootmessage arch_motd arch_memtest \ -arch_linux_firmware arch_intel_wireless arch_hwdetect pata scsi sata \ +arch_linux_firmware arch_intel_wireless arch_hwdetect pata scsi sata memdisk \ arch_cdrom arch_pcspkr arch_net arch_isdn pcmcia arch_sound usb usbinput arch_fw \ arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt btrfs \ arch_filesystems arch_remote arch_cpufreq arch_links arch_kexec arch_ppp arch_xl2tpd arch_pppoe \ diff --git a/etc/archboot/default.conf b/etc/archboot/default.conf index f50cd7114..40fc8f2e3 100644 --- a/etc/archboot/default.conf +++ b/etc/archboot/default.conf @@ -10,7 +10,7 @@ FILES="" # Please change the hooks only if you know what you are doing. HOOKS="arch_fb arch_base arch_core_install arch_installer arch_tz arch_keymap \ arch_acpi arch_bootmessage arch_motd arch_memtest \ -arch_linux_firmware arch_intel_wireless arch_hwdetect pata scsi sata arch_cdrom \ +arch_linux_firmware arch_intel_wireless arch_hwdetect pata scsi sata memdisk arch_cdrom \ arch_pcspkr arch_net arch_isdn pcmcia arch_sound usb usbinput arch_fw \ arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt btrfs \ arch_filesystems arch_remote arch_cpufreq arch_links arch_kexec arch_ppp arch_xl2tpd \ diff --git a/usr/share/archboot/docs/TODO.txt b/usr/share/archboot/docs/TODO.txt index 408a693e6..0980d586b 100644 --- a/usr/share/archboot/docs/TODO.txt +++ b/usr/share/archboot/docs/TODO.txt @@ -16,7 +16,6 @@ Planned Features: - Chroot installation - Keymap changing during boot - Add gummiboot uefi boot manager for EFISTUB kernels - alternative for rEFInd -- Add iso booting using syslinux's memdisk - needs changes in setup script (might be similar to grub's loopback support) Long term setup goals: - Add automatic installation (perhaps not possible with archboot setup) diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup index f8a99ce83..07b9ea25d 100755 --- a/usr/share/archboot/installer/setup +++ b/usr/share/archboot/installer/setup @@ -345,9 +345,7 @@ get_media() { break fi done - - - + AUTOMOUNT="1" # ide devices @@ -388,6 +386,13 @@ get_media() { check_media done fi + + if [[ "${SET_MEDIA}" == "0" ]]; then + # memdisk device with raw partitions + for dev in $(ls /dev/mtdblock0 2>/dev/null); do + check_media + done + fi }