Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-10-30 20:12:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

makeiso.sh now aware of switch to timesyncd

Browse source
This commit is contained in:
t3chn0m4g3 2022-03-31 15:06:48 +00:00
parent 5f18f7f17f
commit d3546b1ae0
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iso/installer/install.sh
View file

@ -667,7 +667,7 @@ fi
if [ "$myCONF_NTP_USE" == "0" ]; if [ "$myCONF_NTP_USE" == "0" ];
then then
fuBANNER "Setup NTP" fuBANNER "Setup NTP"
cp $myCONF_NTP_CONF_FILE /etc/ntp.conf cp $myCONF_NTP_CONF_FILE /etc/systemd/timesyncd.conf
fi fi
# Let's setup 802.1x networking # Let's setup 802.1x networking

34
makeiso.sh
View file

@ -11,7 +11,7 @@ myTPOTSEED="iso/preseed/tpot.seed"
myPACKAGES="dialog genisoimage syslinux syslinux-utils pv rsync udisks2 xorriso" myPACKAGES="dialog genisoimage syslinux syslinux-utils pv rsync udisks2 xorriso"
myPFXFILE="iso/installer/keys/8021x.pfx" myPFXFILE="iso/installer/keys/8021x.pfx"
myINSTALLERPATH="iso/installer/install.sh" myINSTALLERPATH="iso/installer/install.sh"
myNTPCONFFILE="iso/installer/ntp.conf" myNTPCONFFILE="iso/installer/timesyncd.conf"
myTMP="tmp" myTMP="tmp"
myCONF_FILE="iso/installer/iso.conf" myCONF_FILE="iso/installer/iso.conf"
myCONF_DEFAULT_FILE="iso/installer/iso.conf.dist" myCONF_DEFAULT_FILE="iso/installer/iso.conf.dist"
@ -162,19 +162,25 @@ do
if valid_ip $myCONF_NTP_IP; then myIPRESULT="true"; fi if valid_ip $myCONF_NTP_IP; then myIPRESULT="true"; fi
done done
tee $myNTPCONFFILE <<EOF tee $myNTPCONFFILE <<EOF
driftfile /var/lib/ntp/ntp.drift # This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
#
# See timesyncd.conf(5) for details.
statistics loopstats peerstats clockstats [Time]
filegen loopstats file loopstats type day enable NTP=$myCONF_NTP_IP
filegen peerstats file peerstats type day enable #FallbackNTP=0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org
filegen clockstats file clockstats type day enable #RootDistanceMaxSec=5
#PollIntervalMinSec=32
server $myCONF_NTP_IP #PollIntervalMaxSec=2048
restrict -4 default kod notrap nomodify nopeer noquery
restrict -6 default kod notrap nomodify nopeer noquery
restrict 127.0.0.1
restrict ::1
EOF EOF
break break
@ -198,7 +204,7 @@ if [ "$myCONF_PROXY_USE" == "0" ] || [ "$myCONF_PFX_USE" == "0" ] || [ "$myCONF_
echo "myCONF_PFX_HOST_ID=\"$myCONF_PFX_HOST_ID\"" >> $myCONF_FILE echo "myCONF_PFX_HOST_ID=\"$myCONF_PFX_HOST_ID\"" >> $myCONF_FILE
echo "myCONF_NTP_USE=\"$myCONF_NTP_USE\"" >> $myCONF_FILE echo "myCONF_NTP_USE=\"$myCONF_NTP_USE\"" >> $myCONF_FILE
echo "myCONF_NTP_IP=\"$myCONF_NTP_IP\"" >> $myCONF_FILE echo "myCONF_NTP_IP=\"$myCONF_NTP_IP\"" >> $myCONF_FILE
echo "myCONF_NTP_CONF_FILE=\"/root/installer/ntp.conf\"" >> $myCONF_FILE echo "myCONF_NTP_CONF_FILE=\"/root/installer/timesyncd.conf\"" >> $myCONF_FILE
fi fi
# Let's download Debian Minimal ISO # Let's download Debian Minimal ISO