autocommit
This commit is contained in:
parent
3eae48fcfb
commit
8db14b64ae
3 changed files with 7 additions and 3 deletions
2
Makefile
2
Makefile
|
@ -1,5 +1,5 @@
|
||||||
iso:
|
iso:
|
||||||
sed "s|%REL_VER%|$(shell grep -E 'release_version.' profiledef.sh | cut -d= -f2 | jq -r '.')|; s|%ALP_VER%|$(shell grep -E 'iso_version.' profiledef.sh | cut -d= -f2 | jq -r '.')|" template/root/install.sh > airootfs/root/install.sh
|
sed "s|%REL_VER%|$(shell grep -E 'release_version.' profiledef.sh | cut -d= -f2 | jq -r '.')|g; s|%ALP_VER%|$(shell grep -E 'iso_version.' profiledef.sh | cut -d= -f2 | jq -r '.')|" template/root/install.sh > airootfs/root/install.sh
|
||||||
sudo mkalpineiso -o ${PWD}/out
|
sudo mkalpineiso -o ${PWD}/out
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|
|
@ -25,6 +25,7 @@ readonly INSTALLATION_SECRETS_FILE="/root/installation.secrets"
|
||||||
readonly INSTALLATION_ANSIBLE_ROOT="srv/ansible"
|
readonly INSTALLATION_ANSIBLE_ROOT="srv/ansible"
|
||||||
readonly INSTALLATION_ANSIBLE_GIT="https://git.noveria.org/Novos/ansible-playbooks.git"
|
readonly INSTALLATION_ANSIBLE_GIT="https://git.noveria.org/Novos/ansible-playbooks.git"
|
||||||
readonly INSTALLATION_ALPINE_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d= -f2)
|
readonly INSTALLATION_ALPINE_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d= -f2)
|
||||||
|
readonly INSTALLATION_REL_VERSION=2412
|
||||||
|
|
||||||
# Colors
|
# Colors
|
||||||
readonly RED='\033[0;31m'
|
readonly RED='\033[0;31m'
|
||||||
|
@ -160,7 +161,7 @@ function introDialogue() {
|
||||||
| |\ | (_) \ V / (_) \__ \ \n
|
| |\ | (_) \ V / (_) \__ \ \n
|
||||||
|_| \_|\___/ \_/ \___/|___/\n\n
|
|_| \_|\___/ \_/ \___/|___/\n\n
|
||||||
OS: Novos
|
OS: Novos
|
||||||
Version: $(date "+%Y%m")
|
Version: $INSTALLATION_REL_VERSION
|
||||||
IP: $(ifconfig eth0 | grep "inet addr" | awk '{$1=$1};1' | awk '{print $2}' | cut -d: -f2)
|
IP: $(ifconfig eth0 | grep "inet addr" | awk '{$1=$1};1' | awk '{print $2}' | cut -d: -f2)
|
||||||
|
|
||||||
How do you want to continue?
|
How do you want to continue?
|
||||||
|
@ -444,6 +445,7 @@ EOT
|
||||||
|
|
||||||
installationSubtaskTitle "Generating motd"
|
installationSubtaskTitle "Generating motd"
|
||||||
chroot "${INSTALLATION_MOUNTPOINT}" /bin/bash -c "/usr/local/noveria/bin/generate_motd" || installationFailed
|
chroot "${INSTALLATION_MOUNTPOINT}" /bin/bash -c "/usr/local/noveria/bin/generate_motd" || installationFailed
|
||||||
|
chroot "${INSTALLATION_MOUNTPOINT}" /bin/bash -c "/usr/local/noveria/bin/nsm check remote" || installationFailed
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "┌──────────────────────────────────────────┐"
|
echo "┌──────────────────────────────────────────┐"
|
||||||
|
|
|
@ -25,6 +25,7 @@ readonly INSTALLATION_SECRETS_FILE="/root/installation.secrets"
|
||||||
readonly INSTALLATION_ANSIBLE_ROOT="srv/ansible"
|
readonly INSTALLATION_ANSIBLE_ROOT="srv/ansible"
|
||||||
readonly INSTALLATION_ANSIBLE_GIT="https://git.noveria.org/Novos/ansible-playbooks.git"
|
readonly INSTALLATION_ANSIBLE_GIT="https://git.noveria.org/Novos/ansible-playbooks.git"
|
||||||
readonly INSTALLATION_ALPINE_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d= -f2)
|
readonly INSTALLATION_ALPINE_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d= -f2)
|
||||||
|
readonly INSTALLATION_REL_VERSION=%REL_VER%
|
||||||
|
|
||||||
# Colors
|
# Colors
|
||||||
readonly RED='\033[0;31m'
|
readonly RED='\033[0;31m'
|
||||||
|
@ -160,7 +161,7 @@ function introDialogue() {
|
||||||
| |\ | (_) \ V / (_) \__ \ \n
|
| |\ | (_) \ V / (_) \__ \ \n
|
||||||
|_| \_|\___/ \_/ \___/|___/\n\n
|
|_| \_|\___/ \_/ \___/|___/\n\n
|
||||||
OS: Novos
|
OS: Novos
|
||||||
Version: $(date "+%Y%m")
|
Version: $INSTALLATION_REL_VERSION
|
||||||
IP: $(ifconfig eth0 | grep "inet addr" | awk '{$1=$1};1' | awk '{print $2}' | cut -d: -f2)
|
IP: $(ifconfig eth0 | grep "inet addr" | awk '{$1=$1};1' | awk '{print $2}' | cut -d: -f2)
|
||||||
|
|
||||||
How do you want to continue?
|
How do you want to continue?
|
||||||
|
@ -444,6 +445,7 @@ EOT
|
||||||
|
|
||||||
installationSubtaskTitle "Generating motd"
|
installationSubtaskTitle "Generating motd"
|
||||||
chroot "${INSTALLATION_MOUNTPOINT}" /bin/bash -c "/usr/local/noveria/bin/generate_motd" || installationFailed
|
chroot "${INSTALLATION_MOUNTPOINT}" /bin/bash -c "/usr/local/noveria/bin/generate_motd" || installationFailed
|
||||||
|
chroot "${INSTALLATION_MOUNTPOINT}" /bin/bash -c "/usr/local/noveria/bin/nsm check remote" || installationFailed
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "┌──────────────────────────────────────────┐"
|
echo "┌──────────────────────────────────────────┐"
|
||||||
|
|
Loading…
Reference in a new issue