aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2021-07-15 05:54:14 +0200
committerSven Gothel <[email protected]>2021-07-15 05:54:14 +0200
commit6f9c34459703bc9212c498987609e84b26fe2a48 (patch)
treec6d51797e64dd17952064dcd5762cc397ce8b2ef
parent14201948b2e8533cf35671cff17d9481e2052833 (diff)
Updated elevator noop->none and ensure sysfsutils is enabled at boot
-rw-r--r--README.txt16
-rw-r--r--scripts/check-io_scheduler.sh3
-rw-r--r--scripts/debootstrap01.sh2
-rw-r--r--scripts/debootstrap02.sh5
-rw-r--r--scripts/s02.sh6
5 files changed, 27 insertions, 5 deletions
diff --git a/README.txt b/README.txt
index f89715f..3fce4a5 100644
--- a/README.txt
+++ b/README.txt
@@ -211,19 +211,29 @@ ZFS_INITRD_ADDITIONAL_DATASETS="$POOL/users $POOL/users/root $POOL/backup $POOL/
vi /etc/default/grub
+++
Remove quiet from: GRUB_CMDLINE_LINUX_DEFAULT
-Add 'elevator=noop' to: GRUB_CMDLINE_LINUX_DEFAULT
- GRUB_CMDLINE_LINUX_DEFAULT="elevator=noop"
+Add 'elevator=none' to: GRUB_CMDLINE_LINUX_DEFAULT
+ GRUB_CMDLINE_LINUX_DEFAULT="elevator=none"
Uncomment: GRUB_TERMINAL=console
Save and quit.
+++
# (JAU - Required for ZFS 0.7)
++
# /etc/default/grub
-GRUB_CMDLINE_LINUX_DEFAULT="elevator=noop"
+GRUB_CMDLINE_LINUX_DEFAULT="elevator=none"
GRUB_CMDLINE_LINUX="root=ZFS=$POOL/system/debian boot=zfs rpool=$POOL bootfs=$POOL/system/debian"
++
+++
++++
+# ensure sysfsutils is enabled at boot
+systemctl is-enabled sysfsutils
++++
+
+Also check if you need /etc/sysfs.d/block_scheduler.conf using sysfsutil
++++
+/sys/block/nvme0n1/queue/scheduler = none
++++
+
#5.0 Configure a basic system environment:
#
diff --git a/scripts/check-io_scheduler.sh b/scripts/check-io_scheduler.sh
new file mode 100644
index 0000000..a63fa79
--- /dev/null
+++ b/scripts/check-io_scheduler.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+for i in /sys/block/* ; do echo $i ; cat $i//queue/scheduler ; done
diff --git a/scripts/debootstrap01.sh b/scripts/debootstrap01.sh
index 9c33ebe..58dba90 100644
--- a/scripts/debootstrap01.sh
+++ b/scripts/debootstrap01.sh
@@ -24,7 +24,7 @@ mkdir -p $STRAPROOT/var/tmp
chmod 1777 $STRAPROOT/var/tmp
debootstrap --arch=amd64 --variant=buildd \
- --include=net-tools,ifupdown,isc-dhcp-client,vim,openssh-server,locales,rsync,sharutils,psmisc,htop,iftop,patch,less \
+ --include=sysfsutils,net-tools,ifupdown,isc-dhcp-client,vim,openssh-server,locales,rsync,sharutils,psmisc,htop,iftop,patch,less \
--components main,contrib,non-free bullseye $STRAPROOT
echo $MYHOSTNAME > $STRAPROOT/etc/hostname
diff --git a/scripts/debootstrap02.sh b/scripts/debootstrap02.sh
index 513b8de..f683d48 100644
--- a/scripts/debootstrap02.sh
+++ b/scripts/debootstrap02.sh
@@ -39,7 +39,7 @@ apt-get install --yes \
debootstrap xorriso live-build syslinux isolinux squashfs-tools genisoimage memtest86+
apt-get install --yes \
- hwinfo dmidecode cpuid cpufrequtils pciutils usbutils hwdata discover \
+ sysfsutils hwinfo dmidecode cpuid cpufrequtils pciutils usbutils hwdata discover \
gnupg gnupg-agent gnupg2 \
git git-buildpackage git-cola git-core git-cvs git-doc git-email git-gui git-man git-svn gitk \
nano pv vim \
@@ -52,6 +52,9 @@ apt-get install --yes \
rsync tcpdump wget openssh-server openssh-client iptables \
lsof rpcbind iptraf iftop wireshark tcpdump pcaputils ngrep
+# ensure sysfsutils is enabled at boot
+systemctl is-enabled sysfsutils
+
# Replace Debian ZFS packages and replace with vanilla latest release
. ./zfs-bullseye-remove.sh
. ./zfs-2.0.2-1-install-debian11.sh
diff --git a/scripts/s02.sh b/scripts/s02.sh
index 4cf1622..290abd4 100644
--- a/scripts/s02.sh
+++ b/scripts/s02.sh
@@ -8,6 +8,12 @@ apt-get clean
echo SET ROOT PASSWORD
passwd root
+echo "Check /etc/default/grub for ZFS ROOT and elevator=none"
+echo "/etc/default/grub: GRUB_CMDLINE_LINUX_DEFAULT=\"elevator=none\""
+echo
+echo "Also check if you need /etc/sysfs.d/block_scheduler.conf using sysfsutil"
+echo
+
echo Test whether grub detects ZFS ROOT
echo grub-probe /
grub-probe /