From 9b47ea9717f916402d4c53cc1f96026017e925f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Nov 2015 00:37:52 +0000 Subject: make vasile check the kernel configuration for overlayfs && squashfs && loop devices support before attempting to do its magic --- build32 | 1 + build64 | 1 + libvasile | 23 +++++++++++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/build32 b/build32 index 01729b9..d084044 100755 --- a/build32 +++ b/build32 @@ -22,6 +22,7 @@ chrootpreparex86 () { } main () { + kernelconfig if checkroot ; then chrootchecksumx86 chrootpreparex86 diff --git a/build64 b/build64 index f41ab06..d658208 100755 --- a/build64 +++ b/build64 @@ -22,6 +22,7 @@ chrootpreparex64 () { } main () { + kernelconfig if checkroot ; then chrootchecksumx64 chrootpreparex64 diff --git a/libvasile b/libvasile index 330f6b0..576f2a0 100755 --- a/libvasile +++ b/libvasile @@ -13,6 +13,21 @@ export local chrootportageconfig="ln -sf /opt/kogaion-build/conf/intel/portage / export local chrootenvupdate="/usr/sbin/env-update && . /etc/profile" export local chrootprofile="eselect profile set 1" +kernelconfig () { + if [[ $(zgrep 'CONFIG_OVERLAY_FS=' /proc/config.gz) && $(zgrep "CONFIG_SQUASHFS=" /proc/config.gz) && $(zgrep "CONFIG_BLK_DEV_LOOP=" /proc/config.gz) ]] ; then + echo "" + echo "Kernel configuration seems OK, moving on" + echo "" + sleep 1 + else + echo "" + echo "Vasile needs OVERLAYFS && SQUASHFS && LOOP DEVICES to work" + echo "Please rebuild the kernel with those activated to use it" + echo "" + exit 1 + fi +} + checkroot () { if [[ "$(whoami)" != root ]] ; then echo "" @@ -61,8 +76,8 @@ chrootchecksumx64 () { done } -coresetupx64 () { -} +#coresetupx64 () { +#} chrootstartx64 () { mount -t squashfs "$chrootx64" "$rodir" @@ -170,8 +185,8 @@ chrootchecksumx86 () { done } -coresetupx86 () { -} +#coresetupx86 () { +#} chrootstartx86 () { mount -t squashfs "$chrootx86" "$rodir" -- cgit v1.2.3