V8.13.520.2025.12.02
Some checks failed
💙 Generating a PUBLIC Live ISO. / 💙 Generating a PUBLIC Live ISO. (push) Has been cancelled
🔐 Generating a Private Live ISO TRIXIE. / 🔐 Generating a Private Live ISO TRIXIE. (push) Has been cancelled
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 1m37s
🛡️ Retrieve DNSSEC status of coresecret.dev. / 🛡️ Retrieve DNSSEC status of coresecret.dev. (push) Successful in 53s

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-12-02 05:42:14 +01:00
parent 123ff669b0
commit 9d11a1bf16
50 changed files with 101 additions and 83 deletions

View File

@@ -234,18 +234,20 @@ Live ()
log_end_msg
fi
if [ -L /root/etc/resolv.conf ] ; then
# assume we have resolvconf
DNSFILE="${rootmnt}/etc/resolvconf/resolv.conf.d/base"
else
DNSFILE="${rootmnt}/etc/resolv.conf"
fi
if [ -f /etc/resolv.conf ] && ! grep -E -q -v '^[[:space:]]*(#|$)' "${DNSFILE}"
then
log_begin_msg "Copying /etc/resolv.conf to ${DNSFILE}"
cp -v /etc/resolv.conf "${DNSFILE}"
log_end_msg
fi
### CISS override for systemd-networkd stack ---------------------------------------------------------------------------------
#if [ -L /root/etc/resolv.conf ] ; then
# # assume we have resolvconf
# DNSFILE="${rootmnt}/etc/resolvconf/resolv.conf.d/base"
#else
# DNSFILE="${rootmnt}/etc/resolv.conf"
#fi
#if [ -f /etc/resolv.conf ] && ! grep -E -q -v '^[[:space:]]*(#|$)' "${DNSFILE}"
#then
# log_begin_msg "Copying /etc/resolv.conf to ${DNSFILE}"
# cp -v /etc/resolv.conf "${DNSFILE}"
# log_end_msg
#fi
### CISS override for systemd-networkd stack ---------------------------------------------------------------------------------
if ! [ -d "/lib/live/boot" ]
then
@@ -264,5 +266,11 @@ Live ()
cp boot.log "${rootmnt}/var/log/live" 2>/dev/null; \
cp fsck.log "${rootmnt}/var/log/live" 2>/dev/null )
### CISS override for /usr/lib/live/boot/0042_ciss_post_decrypt_attest -------------------------------------------------------
sleep 3
[ -x /usr/lib/live/boot/0042_ciss_post_decrypt_attest ] && /usr/lib/live/boot/0042_ciss_post_decrypt_attest
### CISS override for /usr/lib/live/boot/0042_ciss_post_decrypt_attest -------------------------------------------------------
printf "\e[92m[INFO] Successfully applied : [/usr/lib/live/boot/9990-main.sh] \n\e[0m"
}