From 5ad7df56c30ea8e5016cf7177b784bbf7855f7f7 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Wed, 28 Aug 2013 18:55:17 +0200 Subject: [PATCH] correct dmraid activation on pure systemd system, installer needs to do activation systemd cannot handle those events correct --- etc/archboot/allinone.conf | 2 +- etc/archboot/default-network.conf | 2 +- etc/archboot/default.conf | 2 +- usr/lib/initcpio/install/arch_dmraid | 15 --------------- usr/share/archboot/installer/setup | 4 +++- 5 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 usr/lib/initcpio/install/arch_dmraid diff --git a/etc/archboot/allinone.conf b/etc/archboot/allinone.conf index 0a249f461..6738c0146 100644 --- a/etc/archboot/allinone.conf +++ b/etc/archboot/allinone.conf @@ -11,7 +11,7 @@ FILES="" HOOKS="arch_kms udev arch_base arch_core_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap \ arch_acpi arch_motd arch_memtest arch_linux_firmware arch_intel_wireless \ arch_hwdetect block memdisk arch_pcspkr arch_net arch_isdn pcmcia \ -arch_sound keyboard arch_dmraid dmraid arch_devicemapper arch_mdadm mdadm_udev lvm2 arch_lvm2 \ +arch_sound keyboard dmraid arch_devicemapper arch_mdadm mdadm_udev lvm2 arch_lvm2 \ encrypt arch_cryptoloop btrfs arch_filesystems arch_remote arch_cpufreq arch_links arch_kexec arch_ppp arch_xl2tpd \ 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_wireless_staging \ diff --git a/etc/archboot/default-network.conf b/etc/archboot/default-network.conf index 70649c59c..63fa2af63 100644 --- a/etc/archboot/default-network.conf +++ b/etc/archboot/default-network.conf @@ -12,7 +12,7 @@ HOOKS="arch_kms udev arch_base arch_network_install arch_installer arch_tz arch_ arch_acpi arch_bootmessage arch_motd arch_memtest \ arch_linux_firmware arch_intel_wireless arch_hwdetect block memdisk \ arch_pcspkr arch_net arch_isdn pcmcia arch_sound keyboard \ -arch_dmraid dmraid arch_devicemapper arch_mdadm mdadm_udev lvm2 arch_lvm2 encrypt arch_cryptoloop \ +dmraid arch_devicemapper arch_mdadm mdadm_udev lvm2 arch_lvm2 encrypt arch_cryptoloop \ btrfs arch_filesystems arch_remote arch_cpufreq arch_links arch_kexec arch_ppp arch_xl2tpd \ 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 \ diff --git a/etc/archboot/default.conf b/etc/archboot/default.conf index 93522b384..5a655f162 100644 --- a/etc/archboot/default.conf +++ b/etc/archboot/default.conf @@ -12,7 +12,7 @@ HOOKS="arch_kms udev arch_base arch_core_install arch_installer arch_tz arch_key arch_acpi arch_bootmessage arch_motd arch_memtest \ arch_linux_firmware arch_intel_wireless arch_hwdetect block memdisk \ arch_pcspkr arch_net arch_isdn pcmcia arch_sound keyboard \ -arch_dmraid dmraid arch_devicemapper arch_mdadm mdadm_udev lvm2 arch_lvm2 encrypt arch_cryptoloop btrfs \ +dmraid arch_devicemapper arch_mdadm mdadm_udev lvm2 arch_lvm2 encrypt arch_cryptoloop btrfs \ arch_filesystems arch_remote arch_cpufreq arch_links arch_kexec arch_ppp arch_xl2tpd \ 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 \ diff --git a/usr/lib/initcpio/install/arch_dmraid b/usr/lib/initcpio/install/arch_dmraid deleted file mode 100644 index 735f2d329..000000000 --- a/usr/lib/initcpio/install/arch_dmraid +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -# Created by Tobias Powalowski - -build () -{ - # start dmraid on startup - add_symlink "/etc/systemd/system/multi-user.target.wants/dmraid.service" "/usr/lib/systemd/system/dmraid.service" -} - -help () -{ -cat</dev/null 2>&1 fi DIALOG --infobox "Reactivating dmraid devices ..." 0 0 - dmraid -ay -Z >/dev/null 2>&1 + dmraid -ay -I -Z >/dev/null 2>&1 printk on } @@ -1777,6 +1777,8 @@ check_uefisyspart() { 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!