mirror of https://github.com/akuker/RASCSI.git
Move os_integration to root level (#1085)
* Move the os_integration dir from cpp/ to root level Co-authored-by: nucleogenic <nr@nucleogenic.com>
This commit is contained in:
parent
bf53958636
commit
071fdd2dd5
|
@ -7,6 +7,7 @@
|
||||||
!/doc
|
!/doc
|
||||||
!/python
|
!/python
|
||||||
!/cpp
|
!/cpp
|
||||||
|
!/os_integration
|
||||||
!/test
|
!/test
|
||||||
!/easyinstall.sh
|
!/easyinstall.sh
|
||||||
!/LICENCE
|
!/LICENCE
|
||||||
|
|
|
@ -69,7 +69,7 @@ MAN_PAGE_DIR = /usr/local/man/man1
|
||||||
DOC_DIR = ../doc
|
DOC_DIR = ../doc
|
||||||
COVERAGE_DIR = coverage
|
COVERAGE_DIR = coverage
|
||||||
COVERAGE_FILE = piscsi.dat
|
COVERAGE_FILE = piscsi.dat
|
||||||
OS_FILES = os_integration
|
OS_FILES = ../os_integration
|
||||||
|
|
||||||
OBJDIR := obj/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
|
OBJDIR := obj/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
|
||||||
BINDIR := bin/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
|
BINDIR := bin/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
|
||||||
|
|
|
@ -24,9 +24,8 @@ RUN mkdir -p /home/pi/shared_files \
|
||||||
USER pi
|
USER pi
|
||||||
WORKDIR /home/pi/piscsi
|
WORKDIR /home/pi/piscsi
|
||||||
|
|
||||||
RUN mkdir /home/pi/piscsi/{python,cpp}
|
|
||||||
COPY --chown=pi:pi easyinstall.sh .
|
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 cpp/piscsi_interface.proto cpp/piscsi_interface.proto
|
||||||
COPY --chown=pi:pi python/web python/web
|
COPY --chown=pi:pi python/web python/web
|
||||||
COPY --chown=pi:pi python/common python/common
|
COPY --chown=pi:pi python/common python/common
|
||||||
|
|
|
@ -413,12 +413,12 @@ function migrateLegacyData() {
|
||||||
fi
|
fi
|
||||||
if [[ -f "/etc/rsyslog.d/rascsi.conf" ]]; then
|
if [[ -f "/etc/rsyslog.d/rascsi.conf" ]]; then
|
||||||
sudo rm "/etc/rsyslog.d/rascsi.conf"
|
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"
|
echo "Replaced rascsi.conf with piscsi.conf"
|
||||||
fi
|
fi
|
||||||
if [[ -f "/etc/network/interfaces.d/rascsi_bridge" ]]; then
|
if [[ -f "/etc/network/interfaces.d/rascsi_bridge" ]]; then
|
||||||
sudo rm "/etc/network/interfaces.d/rascsi_bridge"
|
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"
|
echo "Replaced rascsi_bridge with piscsi_bridge"
|
||||||
fi
|
fi
|
||||||
if [[ $(getent group rascsi) && $(getent group "$AUTH_GROUP") ]]; then
|
if [[ $(getent group rascsi) && $(getent group "$AUTH_GROUP") ]]; then
|
||||||
|
@ -599,7 +599,7 @@ function setupWiredNetworking() {
|
||||||
echo "Modified /etc/dhcpcd.conf"
|
echo "Modified /etc/dhcpcd.conf"
|
||||||
|
|
||||||
# default config file is made for eth0, this will set the right net interface
|
# 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 "Modified /etc/network/interfaces.d/piscsi_bridge"
|
||||||
|
|
||||||
echo "Configuration completed!"
|
echo "Configuration completed!"
|
||||||
|
|
Loading…
Reference in New Issue