Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Initramfs fixes 

* initramfs: Fix inconsistent whitespace
* initramfs: Fix a spelling error
* initramfs: Set elevator=noop on the rpool's disks

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Richard Laager <rlaager@wiktel.com>
Closes #6807
This commit is contained in:
Brian Behlendorf 2017-11-03 15:38:52 -07:00 committed by Tony Hutter
parent 1c4f5e7d92
commit 414f4a9c54
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/initramfs/scripts/zfs
View File

@ -150,7 +150,7 @@ get_pools()
fi fi
fi fi
# Filter out any exceptions... # Filter out any exceptions...
if [ -n "$ZFS_POOL_EXCEPTIONS" ] if [ -n "$ZFS_POOL_EXCEPTIONS" ]
then then
local found="" local found=""
@ -883,6 +883,24 @@ mountroot()
/bin/sh /bin/sh
fi fi
# Set elevator=noop on the root pool's vdevs' disks. ZFS already
# does this for wholedisk vdevs (for all pools), so this is only
# important for partitions.
"${ZPOOL}" status -L "${ZFS_RPOOL}" 2> /dev/null |
awk '/^\t / && !/(mirror|raidz)/ {
dev=$1;
sub(/[0-9]+$/, "", dev);
print dev
}' |
while read i
do
if [ -e "/sys/block/$i/queue/scheduler" ]
then
echo noop > "/sys/block/$i/queue/scheduler"
fi
done
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# P R E P A R E R O O T F I L E S Y S T E M # P R E P A R E R O O T F I L E S Y S T E M
@ -925,7 +943,7 @@ mountroot()
# NOTE: Mounted in the order specified in the # NOTE: Mounted in the order specified in the
# ZFS_INITRD_ADDITIONAL_DATASETS variable so take care! # ZFS_INITRD_ADDITIONAL_DATASETS variable so take care!
# Go through the complete list (recursivly) of all filesystems below # Go through the complete list (recursively) of all filesystems below
# the real root dataset # the real root dataset
filesystems=$("${ZFS}" list -oname -tfilesystem -H -r "${ZFS_BOOTFS}") filesystems=$("${ZFS}" list -oname -tfilesystem -H -r "${ZFS_BOOTFS}")
for fs in $filesystems $ZFS_INITRD_ADDITIONAL_DATASETS for fs in $filesystems $ZFS_INITRD_ADDITIONAL_DATASETS