From 6901bf4ac23b82b0185fdde815d1092113d79b2f560e6d824e167ef5d7f13ed8 Mon Sep 17 00:00:00 2001 From: "Marc S. Weidner" Date: Fri, 7 Nov 2025 00:42:24 +0100 Subject: [PATCH] V8.13.384.2025.11.06 Signed-off-by: Marc S. Weidner --- README.md | 58 +++++++++++++++++++++++++++++++------------------------ makefile | 2 +- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 53cf975..1d7fa6f 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ include_toc: true [![Static Badge](https://badges.coresecret.dev/badge/Shellstyle-Google-white?style=plastic&logo=google&logoColor=white&logoSize=auto&label=Shellstyle&color=%234285F4)](https://google.github.io/styleguide/shellguide.html)   [![Static Badge](https://badges.coresecret.dev/badge/Gitea-1.25.1-white?style=plastic&logo=gitea&logoColor=white&logoSize=auto&label=gitea&color=%23609926)](https://docs.gitea.com/)   -[![Static Badge](https://badges.coresecret.dev/badge/Runne-0.2.13-white?style=plastic&logo=gitea&logoColor=white&logoSize=auto&label=gitea&color=%23609926)](https://docs.gitea.com/)   +[![Static Badge](https://badges.coresecret.dev/badge/Runner-0.2.13-white?style=plastic&logo=gitea&logoColor=white&logoSize=auto&label=runner&color=%23609926)](https://docs.gitea.com/)   [![Static Badge](https://badges.coresecret.dev/badge/IntelliJ-2025.2.4-white?style=plastic&logo=intellijidea&logoColor=white&logoSize=auto&label=IntelliJ&color=%23000000)](https://www.jetbrains.com/store/?section=personal&billing=yearly)   [![Static Badge](https://badges.coresecret.dev/badge/keepassxc-2.7.10-white?style=plastic&logo=keepassxc&logoColor=white&logoSize=auto&label=KeePassXC&color=%236CAC4D)](https://keepassxc.org/)   [![Static Badge](https://badges.coresecret.dev/badge/netcup-Netcup-white?style=plastic&logo=netcup&logoColor=white&logoSize=auto&label=powered&color=%23056473)](https://www.netcup.com/de)   @@ -440,9 +440,9 @@ predictable script behavior. 2. Preparation: 1. Ensure you are root. - 2. Create the build directory `mkdir /opt/livebuild`. - 3. Place your desired SSH public key in the `authorized_keys` file, for example, in the `/opt/gitea/CISS.debian.live.builder` directory. - 4. Place your desired Password in the `password.txt` file, for example, in the `/opt/gitea/CISS.debian.live.builder` directory. + 2. Create the build directory `mkdir /opt/cdlb` and the tmpfs secrets directory `mkdir /dev/shm/cdlb_secrets`. + 3. Place your desired SSH public key in the `authorized_keys` file, for example, in the `/dev/shm/cdlb_secrets` directory. + 4. Place your desired Password in the `password.txt` file, for example, in the `/dev/shm/cdlb_secrets` directory. 5. Make any other changes you need to. 3. Run the config builder script `./ciss_live_builder.sh` and the integrated `lb build` command (example): @@ -450,21 +450,29 @@ predictable script behavior. ````bash chmod 0700 ./ciss_live_builder.sh timestamp=$(date -u +%Y-%m-%dT%H:%M:%S%z) - ./ciss_live_builder.sh --architecture amd64 \ - --build-directory /opt/livebuild \ - --change-splash hexagon \ - --control "${timestamp}" \ - --cdi \ - --debug \ - --dhcp-centurion \ - --jump-host 10.0.0.128 [c0de:4711:0815:4242::1] [2abc:4711:0815:4242::1]/64 \ - --provider-netcup-ipv6 [c0de:4711:0815:4242::ffff] \ - --renice-priority "-19" \ - --reionice-priority 1 2 \ - --root-password-file /opt/gitea/CISS.debian.live.builder/password.txt \ - --ssh-port 4242 \ - --ssh-pubkey /opt/gitea/CISS.debian.live.builder \ - --trixie + ./ciss_live_builder.sh \ + --architecture amd64 \ + --autobuild=6.16.3+deb13-amd64 \ + --build-directory /opt/cdlb \ + --cdi \ + --change-splash hexagon \ + --control "${timestamp}" \ + --debug \ + --dhcp-centurion \ + --jump-host 10.0.0.128 [c0de:4711:0815:4242::1] [2abc:4711:0815:4242::1]/64 \ + --key_age=keys.txt \ + --key_luks=luks.txt \ + --provider-netcup-ipv6 [c0de:4711:0815:4242::ffff] \ + --reionice-priority 1 2 \ + --renice-priority "-19" \ + --root-password-file /dev/shm/cdlb_secrets/password.txt \ + --signing_key_fpr=98089A472CCF4601CD51D7C7095D36535296EA14B8DE92198723C4DC606E8F76 \ + --signing_key_pass=signing_key_pass.txt \ + --signing_key=signing_key.asc \ + --ssh-port 4242 \ + --ssh-pubkey /dev/shm/cdlb_secrets \ + --sshfp \ + --trixie ```` 4. Locate your ISO in the `--build-directory`. @@ -488,9 +496,9 @@ preview it or run it. 2. Preparation: 1. Ensure you are root. - 2. Create the build directory `mkdir /opt/livebuild`. - 3. Place your desired SSH public key in the `authorized_keys` file, for example, in the `/opt/gitea/CISS.debian.live.builder` directory. - 4. Place your desired Password in the `password.txt` file, for example, in the `/opt/gitea/CISS.debian.live.builder` directory. + 2. Create the build directory `mkdir /opt/cdlb` and the tmpfs secrets directory `mkdir /dev/shm/cdlb_secrets`. + 3. Place your desired SSH public key in the `authorized_keys` file, for example, in the `/dev/shm/cdlb_secrets` directory. + 4. Place your desired Password in the `password.txt` file, for example, in the `/dev/shm/cdlb_secrets` directory. 5. Copy and edit the sample and set your options (no spaces around commas in lists): ````bash @@ -498,10 +506,10 @@ preview it or run it. ```` ````bash - BUILD_DIR=/opt/livebuild - ROOT_PASSWORD_FILE=/opt/gitea/CISS.debian.live.builder/password.txt + BUILD_DIR=/opt/cdlb + ROOT_PASSWORD_FILE=/dev/shm/cdlb_secrets/password.txt SSH_PORT=4242 - SSH_PUBKEY=/root/.ssh + SSH_PUBKEY=/dev/shm/cdlb_secrets # Optional PROVIDER_NETCUP_IPV6=2001:cdb::1 diff --git a/makefile b/makefile index b14351f..131472b 100644 --- a/makefile +++ b/makefile @@ -25,7 +25,7 @@ TIMESTAMP ?= $(shell date -u +%Y-%m-%dT%H-%M-%S) ### Core parameters (safe defaults; override in config.mk, rename config.mk.sample to config.mk and apply the remaining values): ARCH ?= amd64 -AUTOBUILD ?= 6.12.41+deb13-amd64 +AUTOBUILD ?= 6.16.3+deb13-amd64 CONTROL ?= $(TIMESTAMP) ### Nice/ionice settings: