DiskSetup.sh Not Compatible with Gen 5 Instance Types

[ferricoxide]

Problem Description:

Due to NVMe devices using different naming conventions for disks/partition (/dev/nvmeXnYpN vice /dev/xvdXN), script fails when using ${CHROOTDEV}N as targeting-method. See:

• Line 56
• Line 84
• Line 93
• Lines 95-96
• Lines 110-111

Expected Behavior:

The DiskSetup.sh script should work on both NVMe- and non NVME-enabled instance-types

Fix recommendation:

Change targeting method used for the above-enumerated lines.