highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-09-27 20:16:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
openoms
2019-02-06 10:09:20 +00:00
parent 87d0d689ed
commit 7e84cf03d6
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.sdcard/raspbianStretchDesktop.sh
View File

@@ -589,8 +589,7 @@ if [ "${baseImage}" = "raspbian" ]; then
display_rotate=3 display_rotate=3
dtoverlay=i2c-gpio,i2c_gpio_scl=24,i2c_gpio_sda=23 dtoverlay=i2c-gpio,i2c_gpio_scl=24,i2c_gpio_sda=23
EOF
init 6
fi fi
fi EOF
EOF init 6
fi

26
home.admin/40addHDD.sh
View File

@@ -42,25 +42,19 @@ if [ ${existsHDD} -gt 0 ]; then
sudo mount -a sudo mount -a
mountOK=$(df | grep -c /mnt/hdd) mountOK=$(df | grep -c /mnt/hdd)
if [ ${mountOK} -eq 1 ]; then if [ ${mountOK} -eq 1 ]; then
echo "OK - HDD is mounted" echo "OK - HDD is mounted"
echo "" echo ""
# init the RASPIBLITZ Config (if not exist on provision) # init the RASPIBLITZ Config
configExists=$(sudo ls /mnt/hdd/raspiblitz.conf | grep -c 'raspiblitz.conf') source /home/admin/_version.info
if [ ${configExists} -eq 0 ]; then configFile="/mnt/hdd/raspiblitz.conf"
echo "Creating raspiblitz.conf on HDD" sudo touch $configFile
source /home/admin/_version.info sudo chmod 777 ${configFile}
configFile="/mnt/hdd/raspiblitz.conf" echo "# RASPIBLITZ CONFIG FILE" > $configFile
echo "# RASPIBLITZ CONFIG FILE" > $configFile echo "raspiBlitzVersion='${codeVersion}'" >> $configFile
echo "raspiBlitzVersion='${codeVersion}'" >> $configFile echo "network=${network}" >> $configFile
echo "network=${network}" >> $configFile echo "chain=${chain}" >> $configFile
echo "chain=${chain}" >> $configFile echo "hostname=${hostname}" >> $configFile
echo "hostname=${hostname}" >> $configFile
sudo chmod 777 ${configFile}
echo "OK"
echo ""
fi
# move SSH pub keys to HDD so that they survive an update # move SSH pub keys to HDD so that they survive an update
echo "moving SSH pub keys to HDD" echo "moving SSH pub keys to HDD"