Votre Nom 1 year ago
parent
commit
a153096ce7
2 changed files with 11 additions and 24 deletions
  1. 6 17
      build_cube.sh
  2. 5 7
      options/bitcoin-sv.sh

+ 6 - 17
build_cube.sh

@@ -2,7 +2,6 @@
 set -e
 Version=14.0
 Cuda=NO
-ZFS=NO
 kernel_custom=YES
 Webmin="webmin-2.021"
 kernel_dkms="5.15.0-71-generic"
@@ -82,7 +81,7 @@ echo -e ""
 sudo apt-get install lxde lxde-icon-theme -y
 echo -e ""
 sudo apt-get install  checkinstall samba cifs-utils mdadm git build-essential libtool pkg-config automake autoconf ethtool net-tools openvpn filezilla \
-tasksel lzma-dev lzma cmake libuv1-dev libssl-dev msr-tools tightvncserver lm-sensors openssh-server xfsprogs zfsutils-linux -y
+tasksel lzma-dev lzma cmake libuv1-dev libssl-dev msr-tools tightvncserver lm-sensors openssh-server xfsprogs -y
 echo -e ""
 sudo apt-get install pixz pbzip2 pigz btrfs-progs gparted gpart gnome-remote-desktop libcanberra-gtk-module \
 ctorrent libcurl4-openssl-dev bison byacc screen libudev-dev libjansson-dev libncurses5-dev libmicrohttpd-dev curl nvme-cli -y
@@ -492,8 +491,8 @@ if ! [ -r /media/Cloud ];then sudo mkdir /media/Cloud && cd / & sudo ln -s /medi
 if ! [ -r /media/Store ];then sudo mkdir /media/Store && cd / & sudo ln -s /media/Store /Store;fi
 if ! [ -r /media/Partage ];then sudo mkdir /media/Partage && cd / & sudo ln -s /media/Partage /Partage;fi
 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 /media/nvme ];then sudo mkdir /media/nvme && cd / & sudo ln -s /media/nvme /nvme ;fi
+#if ! [ -r /media/nvme1 ];then sudo mkdir /media/nvme1 && cd / & sudo ln -s /media/nvme1 /nvme1 ;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
@@ -508,10 +507,7 @@ UUID=1df72b63-fca0-45c6-992c-3e2532d5591a /media/Store ext4 auto,nofail,noatime,
 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 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
+UUID=c47d2dd0-b654-4865-8b9e-67c47196c081 /nvme btrfs  ssd,nodatacow,discard=async,noatime
 #Chia drive
 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
@@ -727,18 +723,11 @@ function mounting_drives_ {
 if [ ! -f /home/wareck/.pass4 ]
 then
 echo -e "$(tput setaf 10)\nMounting Drives$(tput sgr0)"
-if [ $ZFS = "YES" ]
-then
-if findmnt /media/Cloud/ >/dev/null 2>&1
-then
-sudo zpool export Cloud
-else
-sudo zpool import Cloud
-fi
-fi
 if ! findmnt /media/Partage >/dev/null ; then sudo mount /media/Partage ;fi
 if ! findmnt /media/Store >/dev/null ; then sudo mount /media/Store ;fi
+if ! findmnt /media/Cloud >/dev/null ; then sudo mount /media/Cloud ;fi
 sudo chmod 777 /media/Store
+sudo chmod 777 /media/Cloud
 sudo chmod 777 /media/Partage
 sudo chmod 777 /media/nvme
 sudo chmod 777 /media/Nas

+ 5 - 7
options/bitcoin-sv.sh

@@ -14,16 +14,14 @@ sudo apt-get install libboost-all-dev libdb-dev libdb++-dev libminiupnpc-dev lib
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test
 sudo apt update
 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-8 8
+sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 8
+sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9
+sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9
 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10
 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
-sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30
-sudo update-alternatives --set cc /usr/bin/gcc
-sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30
-sudo update-alternatives --set c++ /usr/bin/g++
+echo "Choose 10:"
 sudo update-alternatives --config gcc
-sudo update-alternatives --config g++
 cd depends
 make download
 make