Skip to content

Commit

Permalink
Add apt cacher proxy configuration bits
Browse files Browse the repository at this point in the history
  • Loading branch information
sonicaj committed Dec 16, 2024
1 parent 3a6c86a commit f279d3f
Show file tree
Hide file tree
Showing 12 changed files with 1,146 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ dist/
scale_build.egg-info/
scale_build/__pycache__/
venv-*
conf/tn/root/*
12 changes: 12 additions & 0 deletions change_branches.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh


branch="master"
cd /mnt/evo/build

for i in "truenas" "truenas_files" "middlewared"; do
echo "\nupdating $i"
git -C sources/"$i" fetch origin
git -C sources/"$i" checkout "$branch"
git -C sources/"$i" reset --hard origin/"$branch"
done
21 changes: 21 additions & 0 deletions chroot.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/sh

umount -f ./tmp/b/proc
umount -f ./tmp/b/sys
umount -f ./tmp/b/packages
rm -rf ./tmp/b
mkdir ./tmp/b
unsquashfs -f -d ./tmp/b ./tmp/cache/basechroot-package.squashfs
mkdir -p ./tmp/b/proc ./tmp/b/sys ./tmp/b/packages
mount proc ./tmp/b/proc -t proc
mount sysfs ./tmp/b/sys -t sysfs
mount --bind ./tmp/pkgdir ./tmp/b/packages

echo "Setup basechroot directory for chroot successfully"

chroot ./tmp/b bash

echo "Cleaning up mounts"
umount -f ./tmp/b/proc
umount -f ./tmp/b/sys
umount -f ./tmp/b/packages
16 changes: 16 additions & 0 deletions conf/build.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ base-packages:
install_recommends: false
- name: ifstat
install_recommends: true
- name: nslcd
install_recommends: true
- name: apt-cacher-ng
install_recommends: true
- name: openzfs
install_recommends: true
- name: open-vm-tools
Expand Down Expand Up @@ -131,6 +135,18 @@ base-packages:
install_recommends: true
- name: openzfs-zfs-initramfs
install_recommends: true
- name: build-essential
install_recommends: true
- name: locales
install_recommends: true
- name: debootstrap
install_recommends: true
- name: xorriso
install_recommends: true
- name: squashfs-tools
install_recommends: true
- name: unzip
install_recommends: true
- name: nvme-cli
install_recommends: true
- name: convmv
Expand Down
1 change: 1 addition & 0 deletions conf/reference-files/etc/group
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ libvirt-qemu:x:986:libvirt-qemu
haproxy:x:130:
uuidd:x:131:
i2c:x:132:
apt-cacher-ng:x:180:
sgx:x:133:
_ssh:x:134:
ntpsec:x:135:
Expand Down
1 change: 1 addition & 0 deletions conf/reference-files/etc/passwd
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ webdav:x:666:666:WebDAV Anonymous User:/var/empty:/usr/sbin/nologin
libvirt-qemu:x:986:106:Libvirt Qemu,,,:/var/lib/libvirt:/usr/sbin/nologin
haproxy:x:126:130::/var/lib/haproxy:/usr/sbin/nologin
uuidd:x:127:131::/run/uuidd:/usr/sbin/nologin
apt-cacher-ng:x:180:180::/var/cache/apt-cacher-ng:/usr/sbin/nologin
ntpsec:x:128:135::/nonexistent:/usr/sbin/nologin
tss:x:129:136:TPM software stack,,,:/var/lib/tpm:/bin/false
iperf3:x:130:137::/nonexistent:/usr/sbin/nologin
Expand Down
Loading

0 comments on commit f279d3f

Please sign in to comment.