diff --git a/usr/lib/initcpio/install/arch_base b/usr/lib/initcpio/install/arch_base index 7bbaac83a..0608a2b7c 100644 --- a/usr/lib/initcpio/install/arch_base +++ b/usr/lib/initcpio/install/arch_base @@ -168,6 +168,8 @@ build () add_file "/usr/lib/modprobe.d/usb-load-ehci-first.conf" # add rule files add_full_dir "/usr/lib/udev" + # add schedule rules file + add_file "/usr/share/archboot/base/etc/udev/rules.d/60-schedulers.rules" "/etc/udev/rules.d/60-schedulers.rules" ### add pacman apps="pacman pacman-db-upgrade pacman-key pacsort pactree cleanupdelta makepkg pacman-optimize pkgdelta \ diff --git a/usr/share/archboot/base/etc/udev/rules.d/60-schedulers.rules b/usr/share/archboot/base/etc/udev/rules.d/60-schedulers.rules new file mode 100644 index 000000000..ee19ae63a --- /dev/null +++ b/usr/share/archboot/base/etc/udev/rules.d/60-schedulers.rules @@ -0,0 +1,3 @@ +# set deadline scheduler for non-rotating disks" +ACTION=="add|change", KERNEL=="sd[a-z]", TEST!="queue/rotational", ATTR{queue/scheduler}="deadline" +ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline" \ No newline at end of file diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup index 273ed7122..af875e91f 100755 --- a/usr/share/archboot/installer/setup +++ b/usr/share/archboot/installer/setup @@ -2166,8 +2166,6 @@ ssd_optimization() { [[ "$(hdparm -I ${i} | grep TRIM)" && ! "$(echo ${ssd_mount_options} | grep "discard")" ]] && ssd_mount_options="${ssd_mount_options} discard" # check on btrfs [[ "${_fstype}" = "btrfs" && ! "$(echo ${ssd_mount_options} | grep "ssd")" ]] && ssd_mount_options="${ssd_mount_options} ssd,space_cache,inode_cache" - # set deadline scheduler - echo deadline > /sys/block/$(basename ${i})/queue/scheduler fi done fi @@ -2938,11 +2936,7 @@ auto_fstab(){ # auto_ssd() # add udev rule for ssd disks using the deadline scheduler by default auto_ssd () { - if [[ ! -f ${DESTDIR}/etc/udev/rules.d/60-schedulers.rules ]]; then - echo "# set deadline scheduler for non-rotating disks" >> ${DESTDIR}/etc/udev/rules.d/60-schedulers.rules - echo "ACTION=="add|change", KERNEL=="sd[a-z]", TEST!="queue/rotational", ATTR{queue/scheduler}="deadline"" >> ${DESTDIR}/etc/udev/rules.d/60-schedulers.rules - echo "ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline"" >> ${DESTDIR}/etc/udev/rules.d/60-schedulers.rules - fi + [[ ! -f ${DESTDIR}/etc/udev/rules.d/60-schedulers.rules ]] && cp /etc/udev/rules.d/60-schedulers.rules ${DESTDIR}/etc/udev/rules.d/60-schedulers.rules } # auto_mdadm()