diff --git a/src/inventory/disks.go b/src/inventory/disks.go index de8b950b8..a0b20e5bb 100644 --- a/src/inventory/disks.go +++ b/src/inventory/disks.go @@ -360,15 +360,6 @@ func (d *disks) checkEligibility(disk *ghw.Disk) (notEligibleReasons []string, i // Check disk partitions for type, name, and mount points: for _, partition := range disk.Partitions { - if partition.Type == "iso9660" { - notEligibleReasons = append( - notEligibleReasons, - "Disk appears to be an ISO installation media (has partition with "+ - "type iso9660)", - ) - isInstallationMedia = true - } - if strings.HasSuffix(partition.MountPoint, "iso") { notEligibleReasons = append( notEligibleReasons, diff --git a/src/inventory/disks_test.go b/src/inventory/disks_test.go index 0dbfa580d..694e3290d 100644 --- a/src/inventory/disks_test.go +++ b/src/inventory/disks_test.go @@ -550,7 +550,7 @@ var _ = Describe("Disks test", func() { }) It("filters ISO disks / marks them as installation media", func() { - blockInfo, expectedDisks := prepareDisksTest(dependencies, 3) + blockInfo, expectedDisks := prepareDisksTest(dependencies, 2) blockInfo.Disks[0].Partitions = []*ghw.Partition{ { @@ -569,27 +569,9 @@ var _ = Describe("Disks test", func() { } expectedDisks[0].IsInstallationMedia = true - blockInfo.Disks[1].Partitions = []*ghw.Partition{ - { - Disk: nil, - Name: "partition2", - Label: "partition2-label", - MountPoint: "/some/mount/point", - SizeBytes: 5555, - Type: "iso9660", - IsReadOnly: false, - }, - } - - expectedDisks[1].InstallationEligibility.Eligible = false - expectedDisks[1].InstallationEligibility.NotEligibleReasons = []string{ - "Disk appears to be an ISO installation media (has partition with type iso9660)", - } - expectedDisks[1].IsInstallationMedia = true - // Make sure regular disks don't get marked as installation media - expectedDisks[2].InstallationEligibility.Eligible = true - expectedDisks[2].IsInstallationMedia = false + expectedDisks[1].InstallationEligibility.Eligible = true + expectedDisks[1].IsInstallationMedia = false mockFetchDisks(dependencies, nil, blockInfo.Disks...) ret := GetDisks(&config.SubprocessConfig{}, dependencies)