#5118 MBR to GPT to support >2TB nvmes

Makefile

@@ -38,7 +38,7 @@ amd64-lean-desktop-uefi-img:
 	  --preseed_file preseed.cfg \
 	  --boot uefi \
 	  --desktop gnome \
-	  --image_type raw
+		--image_type raw
 
 	# Compute the checksum of the qemu image
 	cd ci/amd64/builds/raspiblitz-amd64-debian-lean-qemu && \

home.admin/config.scripts/blitz.data.sh

@@ -1342,16 +1342,16 @@ if [ "$action" = "copy-system" ]; then
 
     # RASPBERRY PI
     if [ "${computerType}" = "raspberrypi" ]; then
-        echo "# RaspberryPi - set LBA flag" >> ${logFile}
+        echo "# RaspberryPi - set ESP flag" >> ${logFile}
-        parted /dev/${actionDevice} --script set 1 lba on
+        parted /dev/${actionDevice} --script set 1 esp on
         
-        # DEBUG: Log partition count after LBA flag
+        # DEBUG: Log partition count after ESP flag
-        afterLBAPartitionCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
+        afterESPPartitionCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
-        echo "# DEBUG: Partition count after LBA flag: ${afterLBAPartitionCount}" >> ${logFile}
+        echo "# DEBUG: Partition count after ESP flag: ${afterESPPartitionCount}" >> ${logFile}
         
-        isFlagSetLBA=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*lba')
+        isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'esp')
-        if [ ${isFlagSetLBA} -eq 0 ]; then
+        if [ ${isFlagSetESP} -eq 0 ]; then
-            echo "error='failed to set LBA flag'"
+            echo "error='failed to set ESP flag'"
             exit 1
         fi
         echo "# RaspberryPi - Bootorder" >> ${logFile}
@@ -1368,25 +1368,14 @@ if [ "$action" = "copy-system" ]; then
 
     # VM & PC
     else
-        echo "# VM & PC - set BOOT/ESP flag" >> ${logFile}
+        echo "# VM & PC - set ESP flag" >> ${logFile}
-        parted /dev/${actionDevice} --script set 1 boot on
-        
-        # DEBUG: Log partition count after boot flag
-        afterBootPartitionCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
-        echo "# DEBUG: Partition count after boot flag: ${afterBootPartitionCount}" >> ${logFile}
-        
         parted /dev/${actionDevice} --script set 1 esp on
         
         # DEBUG: Log partition count after setting ESP flag
         afterESPPartitionCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG: Partition count after ESP flag: ${afterESPPartitionCount}" >> ${logFile}
         
-        isFlagSetBOOT=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*boot')
+        isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'esp')
-        if [ ${isFlagSetBOOT} -eq 0 ]; then
-            echo "error='failed to set BOOT flag'"
-            exit 1
-        fi
-        isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*esp')
         if [ ${isFlagSetESP} -eq 0 ]; then
             echo "error='failed to set ESP flag'"
             exit 1
@@ -1721,7 +1710,7 @@ if [ "$action" = "setup" ]; then
             afterWipeFsCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
             echo "# DEBUG SETUP SYSTEM: Partition count after wipefs: ${afterWipeFsCount}" >> ${logFile}
             
-            parted /dev/${actionDevice} --script mklabel msdos
+            parted /dev/${actionDevice} --script mklabel gpt
             
             # DEBUG: Log partition count after mklabel
             afterMklabelCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
@@ -1770,16 +1759,16 @@ if [ "$action" = "setup" ]; then
 
             # RASPBERRY PI
             if [ "${computerType}" = "raspberrypi" ]; then
-                echo "# RaspberryPi - set LBA flag" >> ${logFile}
+                echo "# RaspberryPi - set ESP flag" >> ${logFile}
-                parted /dev/${actionDevice} --script set 1 lba on
+                parted /dev/${actionDevice} --script set 1 esp on
                 
-                # DEBUG: Log partition count after LBA flag
+                # DEBUG: Log partition count after ESP flag
-                afterLBASystemCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
+                afterESPSysteemCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
-                echo "# DEBUG SETUP SYSTEM: Partition count after LBA flag: ${afterLBASystemCount}" >> ${logFile}
+                echo "# DEBUG SETUP SYSTEM: Partition count after ESP flag: ${afterESPSysteemCount}" >> ${logFile}
                 
-                isFlagSetLBA=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*lba')
+                isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'esp')
-                if [ ${isFlagSetLBA} -eq 0 ]; then
+                if [ ${isFlagSetESP} -eq 0 ]; then
-                    echo "error='failed to set LBA flag'"
+                    echo "error='failed to set ESP flag'"
                     exit 1
                 fi
                 echo "# RaspberryPi - Bootorder" >> ${logFile}
@@ -1796,25 +1785,14 @@ if [ "$action" = "setup" ]; then
 
             # VM & PC
             else
-                echo "# VM & PC - set BOOT/ESP flag" >> ${logFile}
+                echo "# VM & PC - set ESP flag" >> ${logFile}
-                parted /dev/${actionDevice} --script set 1 boot on
-                
-                # DEBUG: Log partition count after boot flag
-                afterBootFlagSystemCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
-                echo "# DEBUG SETUP SYSTEM: Partition count after boot flag: ${afterBootFlagSystemCount}" >> ${logFile}
-                
                 parted /dev/${actionDevice} --script set 1 esp on
                 
                 # DEBUG: Log partition count after setting ESP flag
                 afterESPFlagSystemCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
                 echo "# DEBUG SETUP SYSTEM: Partition count after ESP flag: ${afterESPFlagSystemCount}" >> ${logFile}
                 
-                isFlagSetBOOT=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*boot')
+                isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'esp')
-                if [ ${isFlagSetBOOT} -eq 0 ]; then
-                    echo "error='failed to set BOOT flag'"
-                    exit 1
-                fi
-                isFlagSetESP=$(parted /dev/${actionDevice} --script print | grep -c 'fat32.*esp')
                 if [ ${isFlagSetESP} -eq 0 ]; then
                     echo "error='failed to set ESP flag'"
                     exit 1
@@ -1843,25 +1821,25 @@ if [ "$action" = "setup" ]; then
         afterWipeFsStorageCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE: Partition count after wipefs: ${afterWipeFsStorageCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mklabel msdos >> ${logFile}
+    parted /dev/${actionDevice} --script mklabel gpt >> ${logFile}
         
         # DEBUG: Log partition count after mklabel
         afterMklabelStorageCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE: Partition count after mklabel: ${afterMklabelStorageCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mkpart primary fat32 1MiB 513MiB >> ${logFile}
+    parted /dev/${actionDevice} --script mkpart primary fat32 1MiB 513MiB >> ${logFile}
         
         # DEBUG: Log partition count after first mkpart
         afterFirstMkpartStorageCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE: Partition count after first mkpart: ${afterFirstMkpartStorageCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mkpart primary ext4 541MB 65GB >> ${logFile}
+    parted /dev/${actionDevice} --script mkpart primary ext4 541MB 65GB >> ${logFile}
         
         # DEBUG: Log partition count after second mkpart
         afterSecondMkpartStorageCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE: Partition count after second mkpart: ${afterSecondMkpartStorageCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mkpart primary ext4 65GB 100% >> ${logFile}
+    parted /dev/${actionDevice} --script mkpart primary ext4 65GB 100% >> ${logFile}
         
         # DEBUG: Log partition count after third mkpart
         afterThirdMkpartStorageCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
@@ -1938,13 +1916,13 @@ if [ "$action" = "setup" ]; then
         afterWipeFsNoBootCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE NO-BOOT: Partition count after wipefs: ${afterWipeFsNoBootCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mklabel msdos >> ${logFile}
+    parted /dev/${actionDevice} --script mklabel gpt >> ${logFile}
         
         # DEBUG: Log partition count after mklabel
         afterMklabelNoBootCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP STORAGE NO-BOOT: Partition count after mklabel: ${afterMklabelNoBootCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mkpart primary ext4 1MB 100% >> ${logFile}
+    parted /dev/${actionDevice} --script mkpart primary ext4 1MB 100% >> ${logFile}
         
         # DEBUG: Log partition count after mkpart
         afterMkpartNoBootCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
@@ -2007,13 +1985,13 @@ if [ "$action" = "setup" ]; then
         afterWipeFsDataCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP DATA: Partition count after wipefs: ${afterWipeFsDataCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mklabel msdos
+    parted /dev/${actionDevice} --script mklabel gpt
         
         # DEBUG: Log partition count after mklabel
         afterMklabelDataCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)
         echo "# DEBUG SETUP DATA: Partition count after mklabel: ${afterMklabelDataCount}" >> ${logFile}
         
-        parted /dev/${actionDevice} --script mkpart primary ext4 1MB 100%
+    parted /dev/${actionDevice} --script mkpart primary ext4 1MB 100%
         
         # DEBUG: Log partition count after mkpart
         afterMkpartDataCount=$(partx -g /dev/"${actionDevice}" 2>/dev/null | wc -l)

home.admin/config.scripts/bonus.lit.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # https://github.com/lightninglabs/lightning-terminal/releases
-LITVERSION="0.15.2-alpha"
+LITVERSION="0.14.1-alpha"
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
@@ -12,7 +12,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
 fi
 
 # check who signed the release in https://github.com/lightninglabs/lightning-terminal/releases
-PGPsigner="ViktorTigerstrom"
+PGPsigner="guggero"
 
 if [ $PGPsigner = ellemouton ]; then
   pgpPubKey="D7D916376026F177"
@@ -45,7 +45,7 @@ Use your Password B to login.\n
 Hidden Service address for the Tor Browser (see LCD for QR):
 https://${toraddress}\n
 For the command line switch to 'lit' user with: 'sudo su - lit'
-use the commands: 'lncli', 'litcli', 'lit-loop', 'lit-pool', 'lit-frcli' and 'tapcli'.
+use the commands: 'lncli', 'lit-loop', 'lit-pool' and 'lit-frcli'.
 " 19 74
     sudo /home/admin/config.scripts/blitz.display.sh hide
   else
@@ -57,7 +57,7 @@ ${fingerprint}\n
 Use your Password B to login.\n
 Activate TOR to access the web interface from outside your local network.\n
 For the command line switch to 'lit' user with: 'sudo su - lit'
-use the commands: 'lncli', 'litcli', 'loop', 'pool', 'frcli' and 'tapcli'.
+use the commands: 'lncli', 'lit-loop', 'lit-pool' and 'lit-frcli'.
 " 19 63
   fi
   echo "please wait ..."
@@ -150,16 +150,6 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     sudo ln -s /mnt/hdd/app-data/.pool/ /home/lit/.pool
     sudo chown lit:lit -R /mnt/hdd/app-data/.pool
 
-    echo "# Taproot Assets"
-    # move old data if present
-    sudo mv /home/loop/.tapd /mnt/hdd/app-data/ 2>/dev/null
-    echo "# make sure the data directory exists"
-    sudo mkdir -p /mnt/hdd/app-data/.tapd
-    echo "# symlink"
-    sudo rm -rf /home/lit/.tapd # not a symlink.. delete it silently
-    sudo ln -s /mnt/hdd/app-data/.tapd/ /home/lit/.tapd
-    sudo chown lit:lit -R /mnt/hdd/app-data/.tapd
-
     echo "Detect CPU architecture ..."
     isARM=$(uname -m | grep -c 'arm')
     isAARCH64=$(uname -m | grep -c 'aarch64')
@@ -230,7 +220,6 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     sudo install -m 0755 -o root -g root -t /usr/local/bin litd
     sudo install -m 0755 -o root -g root -t /usr/local/bin loop
     sudo install -m 0755 -o root -g root -t /usr/local/bin pool
-    sudo install -m 0755 -o root -g root -t /usr/local/bin tapcli
 
     ###########
     # config  #
@@ -327,21 +316,15 @@ WantedBy=multi-user.target
 
   # aliases
   echo "
-alias litcli=\"litcli --rpcserver=localhost:8443 \
+alias lit-loop=\"loop --rpcserver=localhost:8443 \
-  --tlscertpath=/home/lit/.lit/tls.cert \
-  --macaroonpath=/home/lit/.lit/${chain}net/lit.macaroon\"
-alias loop=\"loop --rpcserver=localhost:8443 \
   --tlscertpath=/home/lit/.lit/tls.cert \
   --macaroonpath=/home/lit/.loop/${chain}net/loop.macaroon\"
-alias pool=\"pool --rpcserver=localhost:8443 \
+alias lit-pool=\"pool --rpcserver=localhost:8443 \
   --tlscertpath=/home/lit/.lit/tls.cert \
   --macaroonpath=/home/lit/.pool/${chain}net/pool.macaroon\"
-alias frcli=\"frcli --rpcserver=localhost:8443 \
+alias lit-frcli=\"frcli --rpcserver=localhost:8443 \
   --tlscertpath=/home/lit/.lit/tls.cert \
   --macaroonpath=/home/lit/.faraday/${chain}net/faraday.macaroon\"
-alias tapcli=\"tapcli --rpcserver=localhost:8443 \
-  --tlscertpath=/home/lit/.lit/tls.cert \
-  --macaroonpath=/home/lit/.tapd/data/${chain}net/admin.macaroon\"
 " | sudo tee -a /home/lit/.bashrc
 
   # open ports on firewall