ROSAForum

Код: Выделить всё

/dev/nvme0n1: PTUUID="000ec756" PTTYPE="dos"

Код: Выделить всё

sub total_hdds_size {
    my @output = `fdisk -l| grep "/dev/sd.:\\|/dev/hd.:\\|/dev/vd.:\\|/dev/mmcblk.:"`;
    my $hdds;
    my $rounded;
    my $str;

    foreach $str (@output) {
        my @list = split(/ /,$str);
        my $hdd = $list[1];
        $hdd =~ s/://g;
        next if (is_live_root($hdd));
        $hdds += $list[4]/(1000**3);
        $rounded = sprintf("%.1f",$list[4]/(1000**3));
        $_[0] .= N("  HDD ").$list[1]." ".$rounded.N(" Gb\n");
    }
    if (!$_[0]) {
        $_[0] .= N("  Hard drives are not found!\n");
    }

    return  $hdds;
}

Код: Выделить всё

    if (!$autoinstall::enabled) {
        check_min_sys_requirements::main($in);
    }

Код: Выделить всё

    if (!$autoinstall::enabled) {
#        check_min_sys_requirements::main($in);
    }

Код: Выделить всё

# check_min_sys_requirements::main($in);

Код: Выделить всё

    my @output = `fdisk -l| grep "/dev/sd.:\\|/dev/hd.:\\|/dev/vd.:\\|/dev/mmcblk.:\\|/dev/nvme.:"`;

Код: Выделить всё

fdisk -l| grep "/dev/sd.:\\|/dev/hd.:\\|/dev/vd.:\\|/dev/mmcblk.:\\|/dev/nvme.:"

Код: Выделить всё

fdisk -l| grep "/dev/sd.:\\|/dev/hd.:\\|/dev/vd.:\\|/dev/mmcblk.:\\|/dev/nvme.*:"

Код: Выделить всё

$hdds += $list[4]/(1000**6);

Код: Выделить всё

diff -Naur libDrakX.org/check_min_sys_requirements.pm libDrakX/check_min_sys_requirements.pm
--- libDrakX.org/check_min_sys_requirements.pm
+++ libDrakX/check_min_sys_requirements.pm
@@ -30,7 +30,7 @@
 }
 
 sub total_hdds_size {
-    my @output = `fdisk -l| grep "/dev/sd.:\\|/dev/hd.:\\|/dev/vd.:\\|/dev/mmcblk.:"`;
+    my @output = `fdisk -l| grep "/dev/sd.:\\|/dev/hd.:\\|/dev/vd.:\\|/dev/mmcblk.:\\|/dev/nvme.n.:"`;
     my $hdds;
     my $rounded;
     my $str;
diff -Naur libDrakX.org/detect_devices.pm libDrakX/detect_devices.pm
--- libDrakX.org/detect_devices.pm
+++ libDrakX/detect_devices.pm
@@ -33,7 +33,7 @@
     #- 2. The first SCSI device if SCSI exists. Or
     #- 3. The first RAID device if RAID exists.
 
-    getIDE(), getSCSI(), getMmcBlk(), getXenBlk(), getVirtIO(), getDAC960(), getCompaqSmartArray(), getATARAID();
+    getIDE(), getSCSI(), getNvme(), getMmcBlk(), getXenBlk(), getVirtIO(), getDAC960(), getCompaqSmartArray(), getATARAID();
 }
 sub hds()         { grep { may_be_a_hd($_) } get() }
 sub tapes()       { grep { $_->{media_type} eq 'tape' } get() }
@@ -409,6 +409,14 @@
     } glob("/sys/bus/mmc/devices/*/block/*");
 }
 
+sub getNvme() {
+    -d '/sys/bus/pci/drivers/nvme' or return;
+    map {
+        my $d = basename($_);
+        { device => $d, info => "NVM Express [$d]", media_type => 'hd', bus => 'nvme' };
+    } glob("/sys/block/nvme*n*");
+}
+
 # cpu_name : arch() =~ /^alpha/ ? "cpu	" :
 # arch() =~ /^ppc/ ? "processor" : "vendor_id"
 

Код: Выделить всё

patch --dry-run -p0 <nvme_support.patch

Код: Выделить всё

host-109 bin # patch -p0 <nvme_support.patch.txt 
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur libDrakX.org/check_min_sys_requirements.pm libDrakX/check_min_sys_requirements.pm
|--- libDrakX.org/check_min_sys_requirements.pm 2017-11-15 00:52:57.000000000 +1000
|+++ libDrakX/check_min_sys_requirements.pm     2017-12-14 18:58:33.075000000 +1000
--------------------------
File to patch: 

Код: Выделить всё

cd /usr/lib/libDrakX
patch -p1 < путь_к_nvme_support.patch.txt

Код: Выделить всё

error: no device : <номер>
Entering rescue mode ...
grub rescue _ 

Код: Выделить всё

efibootmgr --create --gpt --disk /dev/sda --part 1 \
           --write-signature --label "ROSA Linux (kernel-$(uname -r))" \
           --loader "\EFI\rosa\vmlinuz-$(uname -r)" \
           -u "$(cat /proc/cmdline) initrd=/EFI/rosa/initrd-$(uname -r).img"

Код: Выделить всё

efibootmgr -v

Код: Выделить всё

$ sudo lsinitrd /boot/initrd-4.9.76-nrj-desktop-1rosa-x86_64.img | grep nvme
drwxr-xr-x   4 root     root            0 Jan 14 19:59 lib/modules/4.9.76-nrj-desktop-1rosa-x86_64/kernel/drivers/nvme
drwxr-xr-x   2 root     root            0 Jan 14 19:59 lib/modules/4.9.76-nrj-desktop-1rosa-x86_64/kernel/drivers/nvme/host
-rw-r--r--   1 root     root        17572 Jan 11 00:58 lib/modules/4.9.76-nrj-desktop-1rosa-x86_64/kernel/drivers/nvme/host/nvme-core.ko.xz
-rw-r--r--   1 root     root         6572 Jan 11 00:58 lib/modules/4.9.76-nrj-desktop-1rosa-x86_64/kernel/drivers/nvme/host/nvme-fabrics.ko.xz
-rw-r--r--   1 root     root        14020 Jan 11 00:58 lib/modules/4.9.76-nrj-desktop-1rosa-x86_64/kernel/drivers/nvme/host/nvme.ko.xz
-rw-r--r--   1 root     root        13428 Jan 11 00:58 lib/modules/4.9.76-nrj-desktop-1rosa-x86_64/kernel/drivers/nvme/host/nvme-rdma.ko.xz
drwxr-xr-x   2 root     root            0 Jan 14 19:59 lib/modules/4.9.76-nrj-desktop-1rosa-x86_64/kernel/drivers/nvme/target
-rw-r--r--   1 root     root         5964 Jan 11 00:58 lib/modules/4.9.76-nrj-desktop-1rosa-x86_64/kernel/drivers/nvme/target/nvme-loop.ko.xz
-rw-r--r--   1 root     root        17192 Jan 11 00:58 lib/modules/4.9.76-nrj-desktop-1rosa-x86_64/kernel/drivers/nvme/target/nvmet.ko.xz

Код: Выделить всё

--- a/util/getroot.c    2012-06-22 11:42:07.000000000 -0400
+++ b/util/getroot.c    2018-02-21 14:59:55.000000000 -0500
@@ -1677,6 +1677,24 @@
          return path;
        }
 
+      /* If this is a NVMe device */
+      if ((strncmp ("nvme", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
+       {
+         char *pp = p + 4;
+         while (*pp >= '0' && *pp <= '9')
+           pp++;
+         if (*pp == 'n')
+           pp++;
+         while (*pp >= '0' && *pp <= '9')
+           pp++;
+         if (*pp == 'p')
+           *is_part = 1;
+         /* /dev/nvme[0-9]+n[0-9]+p[0-9]* */
+         *pp = '\0';
+
+         return path;
+       }
+
       /* If this is a DAC960 disk.  */
       if (strncmp ("rd/c", p, 4) == 0)
        {

Код: Выделить всё

efibootmgr -c -d /dev/nvme0n1 -p 1 -L rosa -l \\EFI\\rosa\\grubx64.efi