diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-07-23 22:52:00 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-07-24 00:56:47 +0200 |
| commit | 31475eb3e28e326553c89753874df3171cdf33ec (patch) | |
| tree | f002db5ed6f1a5d59ed9050c7af9ce06bd62e45b /defaults | |
| parent | cryptsetup: Enable UDEV support (diff) | |
| download | genkernel-31475eb3e28e326553c89753874df3171cdf33ec.tar.gz genkernel-31475eb3e28e326553c89753874df3171cdf33ec.tar.bz2 genkernel-31475eb3e28e326553c89753874df3171cdf33ec.zip | |
bcache: Switch to UDEV usage
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'defaults')
| -rw-r--r-- | defaults/initrd.scripts | 24 | ||||
| -rw-r--r-- | defaults/linuxrc | 10 | ||||
| -rw-r--r-- | defaults/software.sh | 7 |
3 files changed, 7 insertions, 34 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 5515f49..8e7d109 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1635,30 +1635,6 @@ start_volumes() { fi fi - if [ "${USE_BCACHE}" = '1' ] - then - if [ ! -e /sys/fs/bcache/register_quiet ] - then - bad_msg "dobcache invoked but '/sys/fs/bcache/register_quiet' does not exist; Skipping bcache initialization ..." - else - good_msg "Registering all block devices in bcache ..." - - local i= - for i in $(awk '$4 !~ /^(name$|$)/ { print $4 }' /proc/partitions) - do - if [ -e "/dev/${i}" ] - then - # Push all the block devices to register_quiet - # If its bcache, it will bring it up, if not, it will simply ignore it. - log_msg "COMMAND: 'echo \"/dev/${i}\" >/sys/fs/bcache/register_quiet'" - echo "/dev/${i}" >/sys/fs/bcache/register_quiet 2>/dev/null - else - warn_msg "'/dev/${i}' should exist but is missing; Ignoring ..." - fi - done - fi - fi - if [ "${USE_BTRFS}" = '1' ] then if ! hash btrfs >/dev/null 2>&1 diff --git a/defaults/linuxrc b/defaults/linuxrc index 4c1b470..e9e97b6 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -147,9 +147,6 @@ do ;; esac ;; - dobcache) - USE_BCACHE=1 - ;; dobtrfs) USE_BTRFS=1 ;; @@ -526,13 +523,6 @@ then FIRSTMODS="${FIRSTMODS} crc32_generic" fi -if [ "${USE_BCACHE}" = '1' ] -then - # Force loading of bcache module in case module loading would - # be skipped because $REAL_ROOT is already present - FIRSTMODS="${FIRSTMODS} bcache" -fi - splash 'init' cmdline_hwopts diff --git a/defaults/software.sh b/defaults/software.sh index a4f15d6..ae7532f 100644 --- a/defaults/software.sh +++ b/defaults/software.sh @@ -9,6 +9,13 @@ # - This file should not override previously defined variables, as their values may # originate from user changes to /etc/genkernel.conf . +GKPKG_BCACHE_TOOLS_PN="bcache-tools" +GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-VERSION_BCACHE_TOOLS}" +GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev" +GKPKG_BCACHE_TOOLS_SRCTAR="${GKPKG_BCACHE_TOOLS_SRCTAR:-${DISTDIR}/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}.tar.gz}" +GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-399021549984ad27bf4a13ae85e458833fe003d7}" +GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}-%%ARCH%%.tar.xz}" + GKPKG_BOOST_PN="boost" GKPKG_BOOST_PV="${GKPKG_BOOST_PV:-VERSION_BOOST}" GKPKG_BOOST_DEPS="boost-build" |