diff --git a/etc/archboot/aarch64-update_installer.conf b/etc/archboot/aarch64-update_installer.conf index 11ff82083..184156efb 100644 --- a/etc/archboot/aarch64-update_installer.conf +++ b/etc/archboot/aarch64-update_installer.conf @@ -13,7 +13,7 @@ FILES=() HOOKS=(archboot_cache archboot_cache_cleanup archboot_firmware archboot_firmware_cleanup \ archboot_base_common archboot_base_common_cleanup archboot_base archboot_base_cleanup \ archboot_filesystems archboot_filesystems_cleanup archboot_net archboot_net_cleanup \ -block dmraid lvm2 encrypt btrfs keyboard archboot_acpi kms udev archboot_cpufreq \ +block lvm2 encrypt btrfs keyboard archboot_acpi kms udev archboot_cpufreq \ archboot_devicemapper archboot_hypervisor archboot_net_common archboot_platform archboot_wireless \ archboot_wireless_staging archboot_installer_common archboot_installer archboot_installer_cleanup \ archboot_tz archboot_keymap archboot_motd archboot_hwdetect archboot_mdadm mdadm_udev \ diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf index e54380286..beaeeb472 100644 --- a/etc/archboot/aarch64.conf +++ b/etc/archboot/aarch64.conf @@ -12,7 +12,7 @@ FILES=() # Please change the hooks only if you know what you are doing. HOOKS=(kms udev archboot_base_common archboot_base archboot_installer_common \ archboot_installer archboot_tz archboot_keymap archboot_acpi archboot_motd archboot_hwdetect \ -block archboot_net_common archboot_net keyboard dmraid archboot_devicemapper archboot_mdadm \ +block archboot_net_common archboot_net keyboard archboot_devicemapper archboot_mdadm \ mdadm_udev lvm2 archboot_lvm2 encrypt btrfs archboot_filesystems archboot_remote archboot_cpufreq \ archboot_kexec archboot_grub archboot_efibootmgr archboot_pciutils archboot_usbutils \ archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \ diff --git a/etc/archboot/riscv64-update_installer.conf b/etc/archboot/riscv64-update_installer.conf index 74f0671c9..5988eea67 100644 --- a/etc/archboot/riscv64-update_installer.conf +++ b/etc/archboot/riscv64-update_installer.conf @@ -13,7 +13,7 @@ FILES=() HOOKS=(archboot_cache archboot_cache_cleanup archboot_firmware archboot_firmware_cleanup \ archboot_base_common archboot_base_common_cleanup archboot_base archboot_base_cleanup \ archboot_filesystems archboot_filesystems_cleanup archboot_net archboot_net_cleanup \ -block dmraid lvm2 encrypt btrfs keyboard archboot_acpi kms udev archboot_devicemapper \ +block lvm2 encrypt btrfs keyboard archboot_acpi kms udev archboot_devicemapper \ archboot_hypervisor archboot_net_common archboot_platform archboot_wireless \ archboot_wireless_staging archboot_installer_common archboot_installer archboot_installer_cleanup \ archboot_tz archboot_keymap archboot_motd archboot_hwdetect archboot_mdadm mdadm_udev \ diff --git a/etc/archboot/riscv64.conf b/etc/archboot/riscv64.conf index 974358b44..55f0c0c0e 100644 --- a/etc/archboot/riscv64.conf +++ b/etc/archboot/riscv64.conf @@ -12,7 +12,7 @@ FILES=() # Please change the hooks only if you know what you are doing. HOOKS=(kms udev archboot_base_common archboot_base archboot_installer_common \ archboot_installer archboot_tz archboot_keymap archboot_acpi archboot_motd archboot_hwdetect \ -block archboot_net_common archboot_net keyboard dmraid archboot_devicemapper archboot_mdadm \ +block archboot_net_common archboot_net keyboard archboot_devicemapper archboot_mdadm \ mdadm_udev lvm2 archboot_lvm2 encrypt btrfs archboot_filesystems archboot_remote \ archboot_kexec archboot_grub archboot_efibootmgr archboot_pciutils archboot_usbutils \ archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \ diff --git a/etc/archboot/x86_64-update_installer.conf b/etc/archboot/x86_64-update_installer.conf index 22fbbbcf5..99d7de86d 100644 --- a/etc/archboot/x86_64-update_installer.conf +++ b/etc/archboot/x86_64-update_installer.conf @@ -13,7 +13,7 @@ FILES=() HOOKS=(archboot_cache archboot_cache_cleanup archboot_firmware archboot_firmware_cleanup \ archboot_base_common archboot_base_common_cleanup archboot_base archboot_base_cleanup \ archboot_filesystems archboot_filesystems_cleanup archboot_net archboot_net_cleanup block \ -dmraid lvm2 encrypt btrfs keyboard archboot_acpi kms udev archboot_cpufreq \ +lvm2 encrypt btrfs keyboard archboot_acpi kms udev archboot_cpufreq \ archboot_devicemapper archboot_pcspkr archboot_hypervisor archboot_net_common \ archboot_dmidecode archboot_platform archboot_wireless archboot_wireless_staging \ archboot_installer_common archboot_installer archboot_installer_cleanup archboot_tz \ diff --git a/etc/archboot/x86_64.conf b/etc/archboot/x86_64.conf index fe80a872b..a4400293a 100644 --- a/etc/archboot/x86_64.conf +++ b/etc/archboot/x86_64.conf @@ -13,7 +13,7 @@ FILES=() HOOKS=(kms udev archboot_base_common archboot_base archboot_installer_common \ archboot_installer archboot_tz archboot_keymap archboot_acpi archboot_motd \ archboot_hwdetect block archboot_pcspkr archboot_net_common archboot_net keyboard \ -dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 encrypt \ +archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 encrypt \ btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec \ archboot_grub archboot_refind archboot_efibootmgr archboot_pciutils archboot_usbutils \ archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \ diff --git a/usr/lib/archboot/installer/autoconfiguration.sh b/usr/lib/archboot/installer/autoconfiguration.sh index 5d6485cfc..94e8f97c4 100644 --- a/usr/lib/archboot/installer/autoconfiguration.sh +++ b/usr/lib/archboot/installer/autoconfiguration.sh @@ -127,15 +127,9 @@ _auto_mkinitcpio() { grep -q "^amdgpu" /proc/modules && _FBPARAMETER="--amd-kms" grep -q "^i915" /proc/modules && _FBPARAMETER="--intel-kms" grep -q "^nouveau" /proc/modules && _FBPARAMETER="--nvidia-kms" - # check on nfs,dmraid and keymap HWPARAMETER + # check on nfs and keymap HWPARAMETER # check on used keymap, if not us keyboard layout ! grep -q '^KEYMAP="us"' "${_DESTDIR}"/etc/vconsole.conf && _HWPARAMETER="${_HWPARAMETER} --keymap" - # check on dmraid - if [[ -e ${_DESTDIR}/lib/initcpio/hooks/dmraid ]]; then - if ! dmraid -r | grep ^no; then - _HWPARAMETER="${_HWPARAMETER} --dmraid" - fi - fi # get kernel version if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then offset=$(hexdump -s 526 -n 2 -e '"%0d"' "${_DESTDIR}/boot/${_VMLINUZ}") diff --git a/usr/lib/archboot/installer/blockdevices.sh b/usr/lib/archboot/installer/blockdevices.sh index 4e52818b3..dca986ab0 100644 --- a/usr/lib/archboot/installer/blockdevices.sh +++ b/usr/lib/archboot/installer/blockdevices.sh @@ -41,8 +41,6 @@ _blockdevices() { # all available block disk devices for dev in $(${_LSBLK} NAME,TYPE | grep "disk$" | cut -d' ' -f1); do # exclude checks: - #- dmraid_devices - # ${_LSBLK} TYPE ${dev} | grep "dmraid" #- iso9660 devices # (${_LSBLK} FSTYPE ${dev} | grep "iso9660" #- fakeraid isw devices @@ -51,7 +49,7 @@ _blockdevices() { # ${_LSBLK} FSTYPE ${dev} | grep "ddf_raid_member" # - zram devices # echo "${dev}" | grep -q 'zram' - if ! ${_LSBLK} TYPE "${dev}" 2>/dev/null | grep -q "dmraid" && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "iso9660" && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "ddf_raid_member" && ! echo "${dev}" | grep -q 'zram'; then + if ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "iso9660" && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "ddf_raid_member" && ! echo "${dev}" | grep -q 'zram'; then echo "${dev}" [[ "${1}" ]] && echo "${1}" fi @@ -131,10 +129,6 @@ _partitionable_raid_devices_partitions() { # lists dmraid devices _dmraid_devices() { - for dev in $(${_LSBLK} NAME,TYPE 2>/dev/null | grep "dmraid$" | cut -d' ' -f 1 | grep -v "_.*p.*$" | sort -u); do - echo "${dev}" - [[ "${1}" ]] && echo "${1}" - done # isw_raid_member, managed by mdadm for dev in $(${_LSBLK} NAME,TYPE 2>/dev/null | grep " raid.*$" | cut -d' ' -f 1 | sort -u); do if ${_LSBLK} NAME,FSTYPE -s "${dev}" | grep "isw_raid_member$"; then @@ -154,23 +148,6 @@ _dmraid_devices() { # dmraid_partitions # - show dmraid partitions _dmraid_partitions() { - for part in $(${_LSBLK} NAME,TYPE | grep "dmraid$" | cut -d' ' -f 1 | grep "_.*p.*$" | sort -u); do - # exclude checks: - # - part of lvm2 device - # ${_LSBLK} FSTYPE ${dev} | grep "LVM2_member" - # - part of luks device - # ${_LSBLK} FSTYPE ${dev} | grep "crypto_LUKS" - # - part of raid device - # ${_LSBLK} FSTYPE ${dev} | grep "linux_raid_member$" - # - extended partition - # $(sfdisk -l 2>/dev/null | grep "${part}" | grep "Extended$" - # - extended partition (LBA) - # sfdisk -l 2>/dev/null | grep "${part}" | grep "(LBA)$") - if ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "crypto_LUKS$" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "LVM2_member$" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "linux_raid_member$" && ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "Extended$"&& ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "(LBA)$"; then - echo "${part}" - [[ "${1}" ]] && echo "${1}" - fi - done # isw_raid_member, managed by mdadm for dev in $(${_LSBLK} NAME,TYPE | grep " md$" | cut -d' ' -f 1 | sort -u); do if ${_LSBLK} NAME,FSTYPE -s "${dev}" 2>/dev/null | grep "isw_raid_member$" | cut -d' ' -f 1; then @@ -230,16 +207,6 @@ _findbootloaderdisks() { fi } -# activate_dmraid() -# activate dmraid devices -_activate_dmraid() -{ - if [[ -e /usr/bin/dmraid ]]; then - _dialog --infobox "Activating dmraid arrays..." 0 0 - dmraid -ay -I -Z >/dev/null 2>&1 - fi -} - # activate_lvm2 # activate lvm2 devices _activate_lvm2() @@ -296,14 +263,13 @@ _activate_luks() # _activate_special_devices() # activate special devices: -# activate dmraid, lvm2 and raid devices, if not already activated during bootup! +# activate lvm2 and raid devices, if not already activated during bootup! # run it more times if needed, it can be hidden by each other! _activate_special_devices() { _RAID_READY="" _LUKS_READY="" _LVM2_READY="" - _activate_dmraid while [[ -n "${_LVM2_READY}" && -n "${_RAID_READY}" && -n "${_LUKS_READY}" ]]; do _activate_raid _activate_lvm2 @@ -475,27 +441,6 @@ _stopluks() [[ -e /tmp/.crypttab ]] && rm /tmp/.crypttab } -#_dmraid_update -_dmraid_update() -{ - _printk off - _dialog --infobox "Deactivating dmraid devices ..." 0 0 - dmraid -an >/dev/null 2>&1 - if [[ -n "${_DETECTED_LVM}" || -n "${_DETECTED_LUKS}" ]]; then - _dialog --defaultno --yesno "Setup detected running dmraid devices and/or running lvm2, luks encrypted devices. If you reduced/deleted partitions on your dmraid device a complete reset of devicemapper devices is needed. This will reset also your created lvm2 or encrypted devices. Are you sure you want to do this?" 0 0 && _RESETDM=1 - if [[ -n "${_RESETDM}" ]]; then - _dialog --infobox "Resetting devicemapper devices ..." 0 0 - dmsetup remove_all >/dev/null 2>&1 - fi - else - _dialog --infobox "Resetting devicemapper devices ..." 0 0 - dmsetup remove_all >/dev/null 2>&1 - fi - _dialog --infobox "Reactivating dmraid devices ..." 0 0 - dmraid -ay -I -Z >/dev/null 2>&1 - _printk on -} - #helpbox for raid _helpraid() { diff --git a/usr/lib/archboot/installer/bootloader.sh b/usr/lib/archboot/installer/bootloader.sh index 616dc3d3e..e65cef5c3 100644 --- a/usr/lib/archboot/installer/bootloader.sh +++ b/usr/lib/archboot/installer/bootloader.sh @@ -25,7 +25,6 @@ _getraidarrays() { _getcryptsetup() { _CRYPTSETUP="" if ! cryptsetup status "$(basename "${_PART_ROOT}")" | grep -q inactive; then - #avoid clash with dmraid here if cryptsetup status "$(basename "${_PART_ROOT}")"; then if [[ "${_NAME_SCHEME_PARAMETER}" == "FSUUID" ]]; then _CRYPTDEVICE="UUID=$(${_LSBLK} UUID "$(cryptsetup status "$(basename "${_PART_ROOT}")" | grep device: | sed -e 's#device:##g')")" @@ -314,7 +313,6 @@ EOF _do_efistub_parameters() { _BOOTDEV="" _FAIL_COMPLEX="" - _USE_DMRAID="" _RAID_ON_LVM="" _UEFISYS_PATH="EFI/archlinux" _BOOTDEV="$(findmnt -vno SOURCE "${_DESTDIR}/boot")" @@ -519,13 +517,9 @@ _do_grub_common_before() { ## - Encryption is not recommended for grub(2) /boot! _BOOTDEV="" _FAIL_COMPLEX="" - _USE_DMRAID="" _RAID_ON_LVM="" _common_bootloader_checks _abort_f2fs_bootpart || return 1 - if ! dmraid -r | grep -q ^no; then - _dialog --yesno "Setup detected dmraid device.\nDo you want to install grub on this device?" 6 50 && _USE_DMRAID=1 - fi if [[ ! -d "${_DESTDIR}/usr/lib/grub" ]]; then _dialog --infobox "Installing grub ..." 0 0 _PACKAGES="grub" @@ -765,9 +759,9 @@ _do_grub_bios() { _do_grub_common_before # try to auto-configure GRUB(2)... _check_bootpart - # check if raid, raid partition, dmraid or device devicemapper is used + # check if raid, raid partition, or device devicemapper is used if echo "${_BOOTDEV}" | grep -q /dev/md || echo "${_BOOTDEV}" | grep /dev/mapper; then - # boot from lvm, raid, partitioned raid and dmraid devices is supported + # boot from lvm, raid, partitioned and raid devices is supported _FAIL_COMPLEX="" if cryptsetup status "${_BOOTDEV}"; then # encryption devices are not supported diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh index 3bebfb264..178c1868d 100644 --- a/usr/lib/archboot/installer/common.sh +++ b/usr/lib/archboot/installer/common.sh @@ -109,9 +109,6 @@ _auto_packages() { if lsblk -rnpo FSTYPE | grep -q vfat; then ! echo "${_PACKAGES}" | grep -qw dosfstools && _PACKAGES="${_PACKAGES} dosfstools" fi - if [[ -n "$(_dmraid_devices)" ]]; then - ! echo "${_PACKAGES}" | grep -qw dmraid && _PACKAGES="${_PACKAGES} dmraid" - fi if lsmod | grep -qw wl; then ! echo "${_PACKAGES}" | grep -qw broadcom-wl && _PACKAGES="${_PACKAGES} broadcom-wl" fi diff --git a/usr/lib/archboot/installer/partition.sh b/usr/lib/archboot/installer/partition.sh index db8aa4655..20c7c823b 100644 --- a/usr/lib/archboot/installer/partition.sh +++ b/usr/lib/archboot/installer/partition.sh @@ -108,16 +108,12 @@ _check_efisys_part() { _partition() { # disable swap and all mounted partitions, umount / last! _umountall - # activate dmraid - _activate_dmraid # check on encrypted devices, else weird things can happen! _stopluks # check on raid devices, else weird things can happen during partitioning! _stopmd # check on lvm devices, else weird things can happen during partitioning! _stoplvm - # update dmraid - [[ -n "$(_dmraid_devices)" ]] && _dmraid_update # switch for mbr usage _set_guid # Select disk to partition @@ -162,7 +158,5 @@ _partition() { fi fi done - # update dmraid - _dmraid_update _NEXTITEM="3" }