diff options
| author | Your Name | 2020-12-09 13:26:47 +0100 |
|---|---|---|
| committer | Your Name | 2020-12-09 13:26:47 +0100 |
| commit | c60b75fae35eb0b71a99c12ccccc3d271ab98b49 (patch) | |
| tree | 74a92b1f0c6e538e4af4f093e4ece5de639e7066 | |
| parent | [nvidia-libs] Update paths (diff) | |
| parent | [chroot] tmpfs size = 2G (diff) | |
| download | mltk-c60b75fae35eb0b71a99c12ccccc3d271ab98b49.tar.gz mltk-c60b75fae35eb0b71a99c12ccccc3d271ab98b49.tar.xz mltk-c60b75fae35eb0b71a99c12ccccc3d271ab98b49.zip | |
Merge branch 'master' of https://git.openslx.org/openslx-ng/mltk
| -rw-r--r-- | core/includes/chroot.inc | 2 | ||||
| -rwxr-xr-x | core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/includes/chroot.inc b/core/includes/chroot.inc index 4339085a..3782ab05 100644 --- a/core/includes/chroot.inc +++ b/core/includes/chroot.inc @@ -91,7 +91,7 @@ chroot_prepare_mounts() { # Newer kernels (5.x) cannot have upperdir as subdirectory of lowerdir - tmpfs mkdir -p "${CHROOT_TMPFS}" - mount -t tmpfs chrootupper "${CHROOT_TMPFS}" || perror "Could not mount tmpfs as upperdir" + mount -t tmpfs -o size=2G chrootupper "${CHROOT_TMPFS}" || perror "Could not mount tmpfs as upperdir" mkdir -p "${CHROOT_UPPER_TMPFS}" || perror "Could not create ${CHROOT_UPPER_TMPFS}" rsync -axHAX "${CHROOT_UPPERDIR}/" "${CHROOT_UPPER_TMPFS}/" || perror "Could not put upperdir into upupdir" diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions index fcf41149..5c579f05 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions +++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions @@ -25,6 +25,8 @@ PARTITION_FILE="/run/openslx/partitions" readonly MOUNT_POINT_45 PARTITION_FILE mkdir -p "/run/openslx" +. /opt/openslx/config + declare -a TMPFILES gettmp () { local vn file |