Добавлен запуск calculate в lxc, исправлена настройка сети

master-3.5 3.5.8.5
parent 264c8a66e5
commit b7f58754c2

@ -19,7 +19,7 @@ depend() {
need localmount root fsck modules
before keymaps consolefont dbus xdm
use swap hostname
keyword -timeout -docker -lxc -systemd-nspawn -vserver
keyword -timeout -docker -systemd-nspawn -vserver
}
check_install_ability()
@ -135,9 +135,10 @@ setup_alsautils() {
}
start() {
local roottype=`variable_value main.os_root_type`
if rc-config list boot | grep -q -e "calculate " -e "calculate$"
then
local roottype=`variable_value main.os_root_type`
local subsystem=`variable_value main.os_subsystem`
local rootflash=`variable_value main.os_root_flash_dev`
if [[ $roottype != "livecd" ]] || grep "video:nvidia" /proc/cmdline &>/dev/null
then
@ -154,12 +155,12 @@ start() {
if [[ $roottype == "livecd" ]] && [[ $rootdev == "/dev/nfs" ]]
then
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
rc-update del calculate boot
/sbin/rc-update --update
udevadm trigger --action="add" --subsystem-match=net
rc-update del calculate boot
if ! [[ -f /var/calculate/server/ca/server.key ]]
then
LANG=C /usr/sbin/cl-core --bootstrap

Loading…
Cancel
Save