diff --git a/.pct-helpers b/.pct-helpers index 894a3c1..f845d1f 100644 --- a/.pct-helpers +++ b/.pct-helpers @@ -206,10 +206,10 @@ xreadpass(){ # -# tklWaitForSetup MSG +# tklWaitForSetup # tklWaitForSetup(){ - printf "$1" + printf "# TKL setup, this may take a while" if [ -z $DRY_RUN ] ; then while ! $(lxc-attach $ID -- test -e /etc/inithooks.conf) ; do printf '.' diff --git a/nextcloud/make.sh b/nextcloud/make.sh index 97f5264..9e0fc35 100755 --- a/nextcloud/make.sh +++ b/nextcloud/make.sh @@ -39,7 +39,7 @@ readVars #---------------------------------------------------------------------- -# XXX cores... +# NOTE: TKL gui will not function correctly without nesting enabled... OPTS_STAGE_1="\ --hostname $CTHOSTNAME \ --cores $CORES \ @@ -49,11 +49,11 @@ OPTS_STAGE_1="\ --storage local-lvm \ --rootfs local-lvm:$DRIVE \ --unprivileged 1 \ + --features nesting=1 ${PCT_EXTRA} \ " OPTS_STAGE_2="\ - --startup order=90,up=10 \ --onboot 1 \ " @@ -91,12 +91,10 @@ sleep ${TIMEOUT:=5} # for tkl inithooks doc see: # https://www.turnkeylinux.org/docs/inithooks -tklWaitForSetup "# TKL setup, this may take a while" - -@ pct reboot $ID +tklWaitForSetup echo "# Starting TKL UI..." -@ lxc-attach $ID -- /usr/sbin/trunkey-init +@ lxc-attach $ID -- /usr/sbin/turnkey-init exit diff --git a/ssh/make.sh b/ssh/make.sh index 76e332f..a933245 100755 --- a/ssh/make.sh +++ b/ssh/make.sh @@ -54,7 +54,6 @@ OPTS_STAGE_1="\ " OPTS_STAGE_2="\ - --startup order=90,up=10 \ --onboot 1 \ " diff --git a/syncthing/make.sh b/syncthing/make.sh index 41be0fb..9c7e026 100755 --- a/syncthing/make.sh +++ b/syncthing/make.sh @@ -53,7 +53,6 @@ OPTS_STAGE_1="\ " OPTS_STAGE_2="\ - --startup order=90,up=10 \ --onboot 1 \ "