diff options
| author |   Oleg Vinichenko <oleg@funtoo.org> | 2016-07-24 08:48:49 +0000 |
|---|---|---|
| committer | Oleg Vinichenko <oleg@funtoo.org> | 2016-07-24 08:48:49 +0000 |
| commit | 0f41264ae7769f73d1c0e7955aca50503479b4be (patch) | |
| tree | 030d14ab3822e958618123bba87273a4f4acd311 | |
| parent | 3.4.40.10 version (diff) | |
| download | genkernel-0f41264ae7769f73d1c0e7955aca50503479b4be.tar.gz genkernel-0f41264ae7769f73d1c0e7955aca50503479b4be.tar.bz2 genkernel-0f41264ae7769f73d1c0e7955aca50503479b4be.zip | |
FL-3223: fix false detection of btrfsv3.4.40.11-funtoo
| -rwxr-xr-x | gen_funcs.sh | 4 | ||||
| -rwxr-xr-x | genkernel | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gen_funcs.sh b/gen_funcs.sh index a4894a05..2938c4ca 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -496,8 +496,8 @@ set_config_with_override() { rootfs_type_is() { local fstype=$1 - - if $(df -t ${fstype} / 2>/dev/null 1>/dev/null) + # Check what rootfs type is. This should fix false detection of btrfs, when it's not explicitly enabled/disabed. #FL-3223. + if awk '($2=="/"){print $3}' /proc/mounts | grep -sq --line-regexp "$fstype" ; then echo yes else @@ -2,7 +2,7 @@ # $Id$ PATH="${PATH}:/sbin:/usr/sbin" -GK_V='3.4.40.10-funtoo' +GK_V='3.4.40.11-funtoo' # Set the default for TMPDIR. May be modified by genkernel.conf or the # --tempdir command line option. |