From a6c67bc1e57fef785f9eb86d33208bf400acb58c Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Fri, 10 Jun 2022 17:19:02 -0600 Subject: [PATCH] autoinstall: fix cdrom location --- subiquity/server/server.py | 2 +- subiquity/server/tests/test_server.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/subiquity/server/server.py b/subiquity/server/server.py index 3f6ee7db..c601a126 100644 --- a/subiquity/server/server.py +++ b/subiquity/server/server.py @@ -85,7 +85,7 @@ from subiquitycore.snapd import ( NOPROBERARG = "NOPROBER" -iso_autoinstall_path = 'autoinstall.yaml' +iso_autoinstall_path = 'cdrom/autoinstall.yaml' reload_autoinstall_path = 'run/subiquity/reload.autoinstall.yaml' cloud_autoinstall_path = 'run/subiquity/cloud.autoinstall.yaml' diff --git a/subiquity/server/tests/test_server.py b/subiquity/server/tests/test_server.py index a5994b73..7675bb7d 100644 --- a/subiquity/server/tests/test_server.py +++ b/subiquity/server/tests/test_server.py @@ -13,6 +13,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +import os import shlex from unittest.mock import Mock @@ -29,6 +30,7 @@ from subiquity.server.server import ( class TestAutoinstallLoad(SubiTestCase): def setUp(self): self.tempdir = self.tmp_dir() + os.makedirs(self.tempdir + '/cdrom', exist_ok=True) opts = Mock() opts.dry_run = True opts.output_base = self.tempdir