Votre Nom 1 year ago
parent
commit
8fd333db0b
4 changed files with 19 additions and 17 deletions
  1. 13 11
      build_cube.sh
  2. 1 1
      options/bitcoin-sv.sh
  3. 1 1
      options/chia.sh
  4. 4 4
      options/flexfarmer.sh

+ 13 - 11
build_cube.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-Version=13.1
+Version=13.2
 Headless=NO
 Cuda=NO
 ZFS=NO
@@ -575,10 +575,10 @@ if ! [ -r /media/Partage ];then sudo mkdir /media/Partage && cd / & sudo ln -s /
 if ! [ -r /media/Nas ];then sudo mkdir /media/Nas && cd / & sudo ln -s /media/Nas /Nas;fi
 if ! [ -r /media/nvme0 ];then sudo mkdir /media/nvme0 && cd / & sudo ln -s /media/nvme0 /nvme0 ;fi
 if ! [ -r /media/nvme1 ];then sudo mkdir /media/nvme1 && cd / & sudo ln -s /media/nvme1 /nvme1 ;fi
-if ! [ -r /Chia ];then sudo mkdir /Chia;fi
-if ! [ -r /Chia/Chia1 ];then sudo mkdir /Chia/Chia1;fi
-if ! [ -r /Chia/Chia2 ];then sudo mkdir /Chia/Chia2;fi
-if ! [ -r /Chia/Chia3 ];then sudo mkdir /Chia/Chia3;fi
+if ! [ -r /farm ];then sudo mkdir /farm;fi
+if ! [ -r /farm/farm0 ];then sudo mkdir /farm/farm0;fi
+if ! [ -r /farm/farm1 ];then sudo mkdir /farm/farm1;fi
+if ! [ -r /farm/farm2 ];then sudo mkdir /farm/farm2;fi
 if ! grep "UUID=1df72b63-fca0-45c6-992c-3e2532d5591a /media/Store ext4" /etc/fstab >/dev/null
 then
 cp /etc/fstab /tmp/fstab
@@ -588,13 +588,15 @@ UUID=6fc06d70-1a38-4706-ae83-0a329181b9f7 /media/Cloud ext4 auto,nofail,noatime,
 UUID=1df72b63-fca0-45c6-992c-3e2532d5591a /media/Store ext4 auto,nofail,noatime,rw,user    0   0
 UUID=a111c12b-d1b4-441a-9352-b6bbc558184e /media/Partage ext4 auto,nofail,noatime,rw,user    0   0
 UUID=77a593df-1bdb-4012-8c9e-ce50864b464d /media/Exos ext4 auto,nofail,noatime,rw,user    0   0
-#btrfs
-UUID=149a9ff1-3269-4b74-8fa4-f14c5c61aa7d /nvme0 btrfs ssd,nodatacow,noatime
-UUID=987fe3b4-cce2-45b1-ab17-8ed9a4843277 /nvme1 btrfs ssd,nodatacow,noatime
+#btrfs raid
+UUID=c47d2dd0-b654-4865-8b9e-67c47196c081 /nvme0 btrfs  ssd,nodatacow,discard=async,noatime
+#btrfs singles
+#UUID=149a9ff1-3269-4b74-8fa4-f14c5c61aa7d /nvme0 btrfs ssd,nodatacow,noatime
+#UUID=987fe3b4-cce2-45b1-ab17-8ed9a4843277 /nvme1 btrfs ssd,nodatacow,noatime
 #Chia drive
-UUID=6d3ebca7-1c35-405e-aa5b-788f32f8a088 /Chia/Chia1 ext4 auto,nofail,noatime,nodiratime,rw,user    0   0
-UUID=b99c7fa3-827c-4c09-a625-a72aec6c9395 /Chia/Chia2 ext4 auto,nofail,noatime,nodiratime,rw,user    0   0
-UUID=e583a1e4-f8c8-4c2b-a427-cee854e0b56d /Chia/Chia3 ext4 auto,nofail,noatime,nodiratime,rw,user    0   0
+UUID=0d145a5a-50b0-456c-8998-549def2f9fc9 /farm/farm0 ext4 auto,nofail,noatime,nodiratime,rw,user  0   0
+UUID=b99c7fa3-827c-4c09-a625-a72aec6c9395 /farm/farm1 ext4 auto,nofail,noatime,nodiratime,rw,user  0   0
+UUID=e583a1e4-f8c8-4c2b-a427-cee854e0b56d /farm/farm2 ext4 auto,nofail,noatime,nodiratime,rw,user  0   0
 EOF
 sudo cp /tmp/fstab /etc/fstab
 fi

+ 1 - 1
options/bitcoin-sv.sh

@@ -13,7 +13,7 @@ sudo apt-get install build-essential libtool autotools-dev automake pkg-config l
 sudo apt-get install libboost-all-dev libdb-dev libdb++-dev libminiupnpc-dev libgoogle-perftools-dev libzmq3-dev -y
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test
 sudo apt update
-sudo apt install g++-10
+sudo apt install g++-10 -y
 sudo update-alternatives --remove-all gcc
 sudo update-alternatives --remove-all g++
 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10

+ 1 - 1
options/chia.sh

@@ -190,7 +190,7 @@ if [ -f /usr/local/bin/distrib_chia.sh ];then sudo rm /usr/local/bin/distrib_chi
 cat <<'EOF'>> distrib_chia.sh
 #!/bin/bash
 echo "IP : $(hostname -I)"
-chia_plot_sink -p 1447 /Chia/Chia1/Plots-nft/ /Chia/Chia2/Plots-nft/ /Chia/Chia3/Plots-nft/ /Partage/Plots-nf>
+chia_plot_sink -p 1447 /farm/farm0/Plots-nft/ /farm/farm1/Plots-nft/ /farm/farm2/Plots-nft/ /Partage/Plots-nft/ /Exos/Plots-nft/
 EOF
 chmod +x distrib_chia.sh
 sudo mv distrib_chia.sh /usr/local/bin/

+ 4 - 4
options/flexfarmer.sh

@@ -99,13 +99,13 @@ print_centered "Install software : [ OK ]"
 }
 
 function nft_builder {
-if [ -f /home/wareck/chia-plotter/build/flexpool.sh ];then rm /home/wareck/chia-plotter/build/flexpool.sh;fi
-if [ ! -d /home/wareck/chia-plotter/build/ ]; then mkdir -p /home/wareck/chia-plotter/build/ ;fi
-cat <<'EOF'>> /home/wareck/chia-plotter/build/flexpool.sh
+if [ -f /home/wareck/chia/chia-plotter/build/flexpool.sh ];then rm /home/wareck/chia/chia-plotter/build/flexpool.sh;fi
+if [ ! -d /home/wareck/chia/chia-plotter/build/ ]; then mkdir -p /home/wareck/chia/chia-plotter/build/ ;fi
+cat <<'EOF'>> /home/wareck/chia/chia-plotter/build/flexpool.sh
 #!/bin/bash
 ./chia_plot -n 1 -r 6 -u 128 -t /media/nvme0/plotting/ -2 /media/nvme1/plotting/ -d /Chia/Chia2/Plots-nft/ -c xch10yjksfwm8s66z32qy35x950608hk8l67vmsur4rwpaanpkd6ks3qhfw5nk -f 8ba5acd276b45fd0f749ce195dcddcf0e63c3bf2e751e9e273faa0125075c36a11f2ee231e7cf74abed2920be97fc373
 EOF
-chmod +x /home/wareck/chia-plotter/build/flexpool.sh
+chmod +x /home/wareck/chia/chia-plotter/build/flexpool.sh
 print_centered "Install nft script : [ OK ]"
 }