mirror of
https://github.com/flynx/proxmox-utils.git
synced 2025-10-29 03:00:09 +00:00
testing...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
0a8ca779ef
commit
03bbfdf821
@ -206,10 +206,10 @@ xreadpass(){
|
|||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# tklWaitForSetup MSG
|
# tklWaitForSetup
|
||||||
#
|
#
|
||||||
tklWaitForSetup(){
|
tklWaitForSetup(){
|
||||||
printf "$1"
|
printf "# TKL setup, this may take a while"
|
||||||
if [ -z $DRY_RUN ] ; then
|
if [ -z $DRY_RUN ] ; then
|
||||||
while ! $(lxc-attach $ID -- test -e /etc/inithooks.conf) ; do
|
while ! $(lxc-attach $ID -- test -e /etc/inithooks.conf) ; do
|
||||||
printf '.'
|
printf '.'
|
||||||
|
|||||||
@ -39,7 +39,7 @@ readVars
|
|||||||
|
|
||||||
#----------------------------------------------------------------------
|
#----------------------------------------------------------------------
|
||||||
|
|
||||||
# XXX cores...
|
# NOTE: TKL gui will not function correctly without nesting enabled...
|
||||||
OPTS_STAGE_1="\
|
OPTS_STAGE_1="\
|
||||||
--hostname $CTHOSTNAME \
|
--hostname $CTHOSTNAME \
|
||||||
--cores $CORES \
|
--cores $CORES \
|
||||||
@ -49,11 +49,11 @@ OPTS_STAGE_1="\
|
|||||||
--storage local-lvm \
|
--storage local-lvm \
|
||||||
--rootfs local-lvm:$DRIVE \
|
--rootfs local-lvm:$DRIVE \
|
||||||
--unprivileged 1 \
|
--unprivileged 1 \
|
||||||
|
--features nesting=1
|
||||||
${PCT_EXTRA} \
|
${PCT_EXTRA} \
|
||||||
"
|
"
|
||||||
|
|
||||||
OPTS_STAGE_2="\
|
OPTS_STAGE_2="\
|
||||||
--startup order=90,up=10 \
|
|
||||||
--onboot 1 \
|
--onboot 1 \
|
||||||
"
|
"
|
||||||
|
|
||||||
@ -91,12 +91,10 @@ sleep ${TIMEOUT:=5}
|
|||||||
# for tkl inithooks doc see:
|
# for tkl inithooks doc see:
|
||||||
# https://www.turnkeylinux.org/docs/inithooks
|
# https://www.turnkeylinux.org/docs/inithooks
|
||||||
|
|
||||||
tklWaitForSetup "# TKL setup, this may take a while"
|
tklWaitForSetup
|
||||||
|
|
||||||
@ pct reboot $ID
|
|
||||||
|
|
||||||
echo "# Starting TKL UI..."
|
echo "# Starting TKL UI..."
|
||||||
@ lxc-attach $ID -- /usr/sbin/trunkey-init
|
@ lxc-attach $ID -- /usr/sbin/turnkey-init
|
||||||
|
|
||||||
|
|
||||||
exit
|
exit
|
||||||
|
|||||||
@ -54,7 +54,6 @@ OPTS_STAGE_1="\
|
|||||||
"
|
"
|
||||||
|
|
||||||
OPTS_STAGE_2="\
|
OPTS_STAGE_2="\
|
||||||
--startup order=90,up=10 \
|
|
||||||
--onboot 1 \
|
--onboot 1 \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
@ -53,7 +53,6 @@ OPTS_STAGE_1="\
|
|||||||
"
|
"
|
||||||
|
|
||||||
OPTS_STAGE_2="\
|
OPTS_STAGE_2="\
|
||||||
--startup order=90,up=10 \
|
|
||||||
--onboot 1 \
|
--onboot 1 \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user