Skip to content

find_devs/openbsd: accept ISO on disk #1132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheRealFalcon merged 1 commit into from
Dec 9, 2021
Merged

find_devs/openbsd: accept ISO on disk #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cloudinit/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,8 +1217,9 @@ def find_devs_with_openbsd(criteria=None, oformat='device',
continue
if entry == 'fd0:':
continue
part_id = 'a' if entry.startswith('cd') else 'i'
devlist.append(entry[:-1] + part_id)
devlist.append(entry[:-1] + 'a')
if not entry.startswith('cd'):
devlist.append(entry[:-1] + 'i')
if criteria == "TYPE=iso9660":
devlist = [i for i in devlist if i.startswith('cd')]
elif criteria in ["LABEL=CONFIG-2", "TYPE=vfat"]:
Expand Down
4 changes: 2 additions & 2 deletions tests/unittests/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2286,7 +2286,7 @@ def test_find_devs_with(self, m_subp):
def test_find_devs_with_openbsd(self, m_subp):
m_subp.return_value = ('cd0:,sd0:630d98d32b5d3759,sd1:,fd0:', '')
devlist = util.find_devs_with_openbsd()
assert devlist == ['/dev/cd0a', '/dev/sd1i']
assert devlist == ['/dev/cd0a', '/dev/sd1a', '/dev/sd1i']

@mock.patch('cloudinit.subp.subp')
def test_find_devs_with_openbsd_with_criteria(self, m_subp):
Expand All @@ -2296,7 +2296,7 @@ def test_find_devs_with_openbsd_with_criteria(self, m_subp):

# lp: #1841466
devlist = util.find_devs_with_openbsd(criteria="LABEL_FATBOOT=A_LABEL")
assert devlist == ['/dev/cd0a', '/dev/sd1i']
assert devlist == ['/dev/cd0a', '/dev/sd1a', '/dev/sd1i']

@pytest.mark.parametrize(
'criteria,expected_devlist',
Expand Down