Update Prozedere

[derNeueDet]

Führe das Script noch mal aus und lass mal bitte die Ausgabe sehen.

[thesorrow101]

Generelle Frage:

Nachdem ein nachziehen ja nicht zielführend ist, wie ist es geplant das Update auszurollen?
Bei Usern wie mir zb, die gerne die Supportfähigkeit erhalten möchten und daher auf Zugang zur Box verzichten.

Ich muss ja zwangsläufig eine neue Karte vom Support bekommen?

Außer alle Boxen sind mit dem selben User und Passwort versehen, dann reicht ja ein Image

[kgb]

login as: pi
pi@192.168.178.66's password:
Access granted. Press Return to begin session.
Linux openwb2alpha1 5.10.63-v7l+ #1488 SMP Thu Nov 18 16:15:28 GMT 2021 armv7l

The programs included with the Debian GNU/Linux system are free software;
the exact distribution terms for each program are described in the
individual files in /usr/share/doc/*/copyright.

Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent
permitted by applicable law.
Last login: Wed Feb 16 19:26:44 2022 from 192.168.178.41
←[?2004h←]0;pi@openwb2alpha1: ~←[01;32mpi@openwb2alpha1←[00m:←[01;34m~ $←[00m cd /var/www/html/openWB
←[?2004h←]0;pi@openwb2alpha1: /var/www/html/openWB←[01;32mpi@openwb2alpha1←[00m:←[01;34m/var/www/html/openWB $←[00m sudo systemctl stop openwb2.service
←[?2004h←]0;pi@openwb2alpha1: /var/www/html/openWB←[01;32mpi@openwb2alpha1←[00m:←[01;34m/var/www/html/openWB $←[00m git pull
←[33mhint: Pulling without specifying how to reconcile divergent branches is←[m
←[33mhint: discouraged. You can squelch this message by running one of the following←[m
←[33mhint: commands sometime before your next pull:←[m
←[33mhint: ←[m
←[33mhint: git config pull.rebase false # merge (the default strategy)←[m
←[33mhint: git config pull.rebase true # rebase←[m
←[33mhint: git config pull.ff only # fast-forward only←[m
←[33mhint: ←[m
←[33mhint: You can replace "git config" with "git config --global" to set a default←[m
←[33mhint: preference for all repositories. You can also pass --rebase, --no-rebase,←[m
←[33mhint: or --ff-only on the command line to override the configured default per←[m
←[33mhint: invocation.←[m
remote: Enumerating objects: 6392, done.←[K
remote: Counting objects: 100% (4107/4107), done.←[K
remote: Compressing objects: 100% (1227/1227), done.←[K
remote: Total 3393 (delta 2452), reused 2967 (delta 2087), pack-reused 0←[K
Receiving objects: 100% (3393/3393), 1.13 MiB | 805.00 KiB/s, done.
Resolving deltas: 100% (2452/2452), completed with 308 local objects.
From https://github.com/openWB/core
270bf537..31c13637 master -> origin/master
* [new branch] fix_charge_template_plans -> origin/fix_charge_template_plans
* [new branch] min_current_by_phases_in_use -> origin/min_current_by_phases_in_use
Updating 270bf537..31c13637
error: Your local changes to the following files would be overwritten by merge:
runs/update.sh
Please commit your changes or stash them before you merge.
Aborting
←[?2004h←]0;pi@openwb2alpha1: /var/www/html/openWB←[01;32mpi@openwb2alpha1←[00m:←[01;34m/var/www/html/openWB $←[00m sudo runs/atreboot.sh
atreboot.sh started
LAN/WLAN...
apache...
...changed
apt packages...
python packages...
Looking in indexes: https://pypi.org/simple, https://www.piwheels.org/simple
Requirement already satisfied: jq==1.1.3 in /usr/local/lib/python3.9/dist-packages (from -r /var/www/html/openWB/requirements.txt (line 1)) (1.1.3)
Requirement already satisfied: paho_mqtt==1.6.1 in /usr/local/lib/python3.9/dist-packages (from -r /var/www/html/openWB/requirements.txt (line 2)) (1.6.1)
Requirement already satisfied: pymodbus==2.5.2 in /usr/local/lib/python3.9/dist-packages (from -r /var/www/html/openWB/requirements.txt (line 3)) (2.5.2)
Requirement already satisfied: pytest==6.2.5 in /usr/local/lib/python3.9/dist-packages (from -r /var/www/html/openWB/requirements.txt (line 4)) (6.2.5)
Requirement already satisfied: requests_mock==1.9.3 in /usr/local/lib/python3.9/dist-packages (from -r /var/www/html/openWB/requirements.txt (line 5)) (1.9.3)
Requirement already satisfied: six>=1.15.0 in /usr/lib/python3/dist-packages (from pymodbus==2.5.2->-r /var/www/html/openWB/requirements.txt (line 3)) (1.16.0)
Requirement already satisfied: pyserial>=3.4 in /usr/local/lib/python3.9/dist-packages (from pymodbus==2.5.2->-r /var/www/html/openWB/requirements.txt (line 3)) (3.5)
Requirement already satisfied: py>=1.8.2 in /usr/local/lib/python3.9/dist-packages (from pytest==6.2.5->-r /var/www/html/openWB/requirements.txt (line 4)) (1.11.0)
Requirement already satisfied: iniconfig in /usr/local/lib/python3.9/dist-packages (from pytest==6.2.5->-r /var/www/html/openWB/requirements.txt (line 4)) (1.1.1)
Requirement already satisfied: attrs>=19.2.0 in /usr/local/lib/python3.9/dist-packages (from pytest==6.2.5->-r /var/www/html/openWB/requirements.txt (line 4)) (21.2.0)
Requirement already satisfied: pluggy<2.0,>=0.12 in /usr/local/lib/python3.9/dist-packages (from pytest==6.2.5->-r /var/www/html/openWB/requirements.txt (line 4)) (1.0.0)
Requirement already satisfied: packaging in /usr/local/lib/python3.9/dist-packages (from pytest==6.2.5->-r /var/www/html/openWB/requirements.txt (line 4)) (21.3)
Requirement already satisfied: toml in /usr/local/lib/python3.9/dist-packages (from pytest==6.2.5->-r /var/www/html/openWB/requirements.txt (line 4)) (0.10.2)
Requirement already satisfied: requests<3,>=2.3 in /usr/lib/python3/dist-packages (from requests_mock==1.9.3->-r /var/www/html/openWB/requirements.txt (line 5)) (2.25.1)
Requirement already satisfied: pyparsing!=3.0.5,>=2.0.2 in /usr/local/lib/python3.9/dist-packages (from packaging->pytest==6.2.5->-r /var/www/html/openWB/requirements.txt (line 4)) (3.0.6)
version...
load versions...
2022-02-16 19:28:01: boot done
←[?2004h←]0;pi@openwb2alpha1: /var/www/html/openWB←[01;32mpi@openwb2alpha1←[00m:←[01;34m/var/www/html/openWB $←[00m sudo systemctl start openwb2.service

[LutzB]

Da hast Du wohl mal was an runs/update.sh geändert. Das blockiert jetzt den automatischen pull.

[kgb]

ne ich habe nix geändert

wei kann ich das lösen ?

[derNeueDet]

Indem du die aktuellste Version des Scriptes nimmst.

viewtopic.php?t=4638#p55192

[kgb]

also das

"cat <<EOF >./update.sh
cd /var/www/html/openWB && echo \$PWD
sudo systemctl stop openwb2 && echo "Service angehalten"
git stash
git pull --ff-only
sudo systemctl start openwb2 && echo "Service gestartet"
sudo runs/atreboot.sh
EOF

chmod 744 ./update.sh"


?

[kgb]

also das letzte bringt auch keine änderung ?

[derNeueDet]

Weißt du überhaupt, was da in den Zeilen steht, die du kopiert hast?

VG
Det

[kgb]

Ich habe das Imgae auf der Sd card, und dann eben nur das srcipt ausgeführt.

Freundlicher Gruß