diff --git a/calamares/settings.conf b/calamares/settings.conf index 0b970fc..4cea0da 100644 --- a/calamares/settings.conf +++ b/calamares/settings.conf @@ -25,7 +25,7 @@ sequence: - mount - unpackfs - fstab - - packages +# - packages - machineid - locale - keyboard diff --git a/component-installer.sh b/component-installer.sh index 623b0a0..16ddd5b 100644 --- a/component-installer.sh +++ b/component-installer.sh @@ -22,6 +22,7 @@ function install_ogcore_docker() { # Leer el JSON y extraer los valores con jq user=$(jq -r '.username' /opt/opengnsys/ogCore/installer/config.json) password=$(jq -r '.password' /opt/opengnsys/ogCore/installer/config.json) + ogcore_version=$(jq -r '.container_version' /opt/opengnsys/ogCore/installer/config.json) # Exportar los valores como variables de entorno export USER_NAME="$user" @@ -51,7 +52,7 @@ Requires=docker.service [Service] WorkingDirectory=/opt/opengnsys/ogCore/repo/ -ExecStart=/usr/local/bin/docker-compose up -d +ExecStart=/usr/local/bin/docker compose up -d ExecStop=/usr/local/bin/docker-compose down Restart=always @@ -129,16 +130,12 @@ do ogCore) echo "Instalando ogCore..." git clone "$OGCORE_REPO" "$component_dir/repo" - echo - ogCore >> /etc/issueq - install_docker - install_ogcore_docker + echo - ogCore >> /etc/issue ;; ogGui) echo "Instalando ogGui..." git clone "$OGGUI_REPO" "$component_dir/repo" echo - ogGui >> /etc/issue - install_docker - install_oggui_docker ;; ogDhcp) echo "Instalando ogDhcp..."