StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autoinstall: fix cdrom location

This commit is contained in:
Dan Bungert 2022-06-10 17:19:02 -06:00
parent a44939e402
commit a6c67bc1e5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subiquity/server/server.py
View File

@ -85,7 +85,7 @@ from subiquitycore.snapd import (
NOPROBERARG = "NOPROBER" NOPROBERARG = "NOPROBER"
iso_autoinstall_path = 'autoinstall.yaml' iso_autoinstall_path = 'cdrom/autoinstall.yaml'
reload_autoinstall_path = 'run/subiquity/reload.autoinstall.yaml' reload_autoinstall_path = 'run/subiquity/reload.autoinstall.yaml'
cloud_autoinstall_path = 'run/subiquity/cloud.autoinstall.yaml' cloud_autoinstall_path = 'run/subiquity/cloud.autoinstall.yaml'

2
subiquity/server/tests/test_server.py
View File

@ -13,6 +13,7 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
import shlex import shlex
from unittest.mock import Mock from unittest.mock import Mock
@ -29,6 +30,7 @@ from subiquity.server.server import (
class TestAutoinstallLoad(SubiTestCase): class TestAutoinstallLoad(SubiTestCase):
def setUp(self): def setUp(self):
self.tempdir = self.tmp_dir() self.tempdir = self.tmp_dir()
os.makedirs(self.tempdir + '/cdrom', exist_ok=True)
opts = Mock() opts = Mock()
opts.dry_run = True opts.dry_run = True
opts.output_base = self.tempdir opts.output_base = self.tempdir