diff options
| author | Jonathan Bauer | 2021-05-18 15:19:46 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2021-05-18 15:19:46 +0200 |
| commit | c4019492362f96d79a58e288fe3b20e57a3bc839 (patch) | |
| tree | 5405ef0e479e35d0d7190a28e5a1aa591612997d | |
| parent | Merge branch 'master' into installer (diff) | |
| parent | chroot.inc: skip bind mounts of inexistant dirs (diff) | |
| download | mltk-c4019492362f96d79a58e288fe3b20e57a3bc839.tar.gz mltk-c4019492362f96d79a58e288fe3b20e57a3bc839.tar.xz mltk-c4019492362f96d79a58e288fe3b20e57a3bc839.zip | |
Merge branch 'master' into installer
| -rw-r--r-- | core/includes/chroot.inc | 4 | ||||
| -rw-r--r-- | core/modules/kernel-vanilla/module.conf | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/includes/chroot.inc b/core/includes/chroot.inc index a35ca9b4..04db53ee 100644 --- a/core/includes/chroot.inc +++ b/core/includes/chroot.inc @@ -120,6 +120,10 @@ chroot_prepare_mounts() { # mount pseudo-filesystems for DIR in $CHROOT_BINDMOUNTS; do + if ! [ -d "$DIR" ]; then + pwarning "Skipping bind mount of inexistant directory: $DIR" + continue + fi mount -o bind "${DIR}" "${CHROOT_MOUNTDIR}/${DIR}" \ || perror "Could not bind mount '$DIR' into CHROOT_MOUNTDIR/DIR '$CHROOT_MOUNTDIR/$DIR'." done diff --git a/core/modules/kernel-vanilla/module.conf b/core/modules/kernel-vanilla/module.conf index 62ece1a4..cbc40e2e 100644 --- a/core/modules/kernel-vanilla/module.conf +++ b/core/modules/kernel-vanilla/module.conf @@ -2,5 +2,5 @@ REQUIRED_BINARIES="" REQUIRED_LIBRARIES="" REQUIRED_DIRECTORIES="" -REQUIRED_KERNEL="5.10.32" +REQUIRED_KERNEL="5.10.37" REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git" |