Conversation
76c3f28 to
66f88e9
Compare
This reverts commit 8b55055.
nucleogenic
left a comment
There was a problem hiding this comment.
Just a heads up, I haven't done any testing yet, e.g. a v22.10.01 -> develop upgrade, but I've approved the PR since we might want to merge anyway, rather than have a massive and long-lived feature branch.
There are more instances of rascsi-containing files that need to be renamed or deleted for users doing an upgrade, e.g the systemd services, but I haven't added comments to the PR for each one.
We might also want to make sure that the old rascsi services are stopped to avoid duplicate processes running (or rather the new services failing to start due to ports being in use).
| -keyout "$SSL_KEYS_PATH/rascsi-web.key" \ | ||
| -out "$SSL_CERTS_PATH/rascsi-web.crt" \ |
There was a problem hiding this comment.
We should consider deleting these files if they exist.
There was a problem hiding this comment.
Would it be non-kosher to rename them? Anyhow, I'll address this in the next PR.
easyinstall.sh
Outdated
| if [[ -f "$HOME/.piscsi_secret" ]]; then | ||
| sudo rm "$HOME/.piscsi_secret" | ||
| echo "Removed (legacy) PiSCSI token file" |
There was a problem hiding this comment.
The file .piscsi_secret should never exist, so we should continue to check for .rascsi_secret.
There was a problem hiding this comment.
Right, it should never exist in the HOME dir. I'll push a quick fix for that.
| echo "Modified /etc/dhcpcd.conf" | ||
|
|
||
| # default config file is made for eth0, this will set the right net interface | ||
| sudo bash -c 'sed s/eth0/'"$LAN_INTERFACE"'/g '"$CPP_PATH"'/os_integration/rascsi_bridge > /etc/network/interfaces.d/rascsi_bridge' |
There was a problem hiding this comment.
Do we need to rename rascsi_bridge to piscsi_bridge if it already exists?
There was a problem hiding this comment.
Yep, and I'll address this in the next PR.
| if [ -f "$WEB_INSTALL_PATH/src/rascsi_interface_pb2.py" ]; then | ||
| sudo rm "$WEB_INSTALL_PATH/src/rascsi_interface_pb2.py" | ||
| echo "Deleting old Python protobuf library $WEB_INSTALL_PATH/src/rascsi_interface_pb2.py" | ||
| if [ -f "$WEB_INSTALL_PATH/src/piscsi_interface_pb2.py" ]; then |
There was a problem hiding this comment.
Should we delete rascsi_interface_pb2.py if it already exists?
There was a problem hiding this comment.
Definitely! I'll do it in the next PR.
TODO: