Move os_integration to root level (#1085)

* Move the os_integration dir from cpp/ to root level

Co-authored-by: nucleogenic <nr@nucleogenic.com>

.dockerignore

@@ -7,6 +7,7 @@
 !/doc
 !/python
 !/cpp
+!/os_integration
 !/test
 !/easyinstall.sh
 !/LICENCE

cpp/Makefile

@@ -69,7 +69,7 @@ MAN_PAGE_DIR  = /usr/local/man/man1
 DOC_DIR = ../doc
 COVERAGE_DIR = coverage
 COVERAGE_FILE = piscsi.dat
-OS_FILES = os_integration
+OS_FILES = ../os_integration
 
 OBJDIR := obj/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
 BINDIR := bin/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')

docker/web/Dockerfile

@@ -24,9 +24,8 @@ RUN mkdir -p /home/pi/shared_files \
 USER pi
 WORKDIR /home/pi/piscsi
 
-RUN mkdir /home/pi/piscsi/{python,cpp}
 COPY --chown=pi:pi easyinstall.sh .
-COPY --chown=pi:pi cpp/os_integration cpp/os_integration
+COPY --chown=pi:pi os_integration os_integration
 COPY --chown=pi:pi cpp/piscsi_interface.proto cpp/piscsi_interface.proto
 COPY --chown=pi:pi python/web python/web
 COPY --chown=pi:pi python/common python/common

easyinstall.sh

@@ -413,12 +413,12 @@ function migrateLegacyData() {
     fi
     if [[ -f "/etc/rsyslog.d/rascsi.conf" ]]; then
         sudo rm "/etc/rsyslog.d/rascsi.conf"
-        sudo cp "$CPP_PATH/os_integration/piscsi.conf" "/etc/rsyslog.d"
+        sudo cp "$BASE/os_integration/piscsi.conf" "/etc/rsyslog.d"
         echo "Replaced rascsi.conf with piscsi.conf"
     fi
     if [[ -f "/etc/network/interfaces.d/rascsi_bridge" ]]; then
         sudo rm "/etc/network/interfaces.d/rascsi_bridge"
-        sudo cp "$CPP_PATH/os_integration/piscsi_bridge" "/etc/network/interfaces.d"
+        sudo cp "$BASE/os_integration/piscsi_bridge" "/etc/network/interfaces.d"
         echo "Replaced rascsi_bridge with piscsi_bridge"
     fi
     if [[ $(getent group rascsi) && $(getent group "$AUTH_GROUP") ]]; then
@@ -599,7 +599,7 @@ function setupWiredNetworking() {
     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/piscsi_bridge > /etc/network/interfaces.d/piscsi_bridge'
+    sudo bash -c 'sed s/eth0/'"$LAN_INTERFACE"'/g '"$BASE"'/os_integration/piscsi_bridge > /etc/network/interfaces.d/piscsi_bridge'
     echo "Modified /etc/network/interfaces.d/piscsi_bridge"
 
     echo "Configuration completed!"