Initializes `existing_usernames` for system_setup.
Since in WSL the target system is already mounted when Subiquity runs its safe to Initialize that field with the target existing passwd database.
This commit is contained in:
parent
7a4356c29f
commit
dbe131fb59
|
@ -16,13 +16,28 @@
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import attr
|
import attr
|
||||||
|
import os
|
||||||
|
from typing import Set
|
||||||
|
|
||||||
|
from subiquity.common.resources import resource_path
|
||||||
from subiquity.common.types import IdentityData
|
from subiquity.common.types import IdentityData
|
||||||
from subiquity.server.controllers.identity import IdentityController
|
from subiquity.server.controllers.identity import IdentityController
|
||||||
|
|
||||||
log = logging.getLogger('system_setup.server.controllers.identity')
|
log = logging.getLogger('system_setup.server.controllers.identity')
|
||||||
|
|
||||||
|
|
||||||
|
def _existing_user_names(path: str) -> Set[str]:
|
||||||
|
names = set()
|
||||||
|
with open(path, "r") as f:
|
||||||
|
for line in f:
|
||||||
|
line = line.strip()
|
||||||
|
if not line:
|
||||||
|
continue
|
||||||
|
names.add(line.split(":")[0])
|
||||||
|
|
||||||
|
return names
|
||||||
|
|
||||||
|
|
||||||
class WSLIdentityController(IdentityController):
|
class WSLIdentityController(IdentityController):
|
||||||
|
|
||||||
autoinstall_schema = {
|
autoinstall_schema = {
|
||||||
|
@ -38,6 +53,7 @@ class WSLIdentityController(IdentityController):
|
||||||
|
|
||||||
def __init__(self, app):
|
def __init__(self, app):
|
||||||
super().__init__(app)
|
super().__init__(app)
|
||||||
|
self.existing_usernames = _existing_user_names(self._passwd_path())
|
||||||
if app.prefillInfo is None or self.interactive() is False:
|
if app.prefillInfo is None or self.interactive() is False:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -58,6 +74,12 @@ class WSLIdentityController(IdentityController):
|
||||||
self.model.add_user(identity_data)
|
self.model.add_user(identity_data)
|
||||||
log.debug('Prefilled Identity: {}'.format(self.model.user))
|
log.debug('Prefilled Identity: {}'.format(self.model.user))
|
||||||
|
|
||||||
|
def _passwd_path(self) -> str:
|
||||||
|
if self.app.opts.dry_run:
|
||||||
|
return resource_path("passwd")
|
||||||
|
else:
|
||||||
|
return os.path.join(self.app.base_model.target, "etc/passwd")
|
||||||
|
|
||||||
def load_autoinstall_data(self, data):
|
def load_autoinstall_data(self, data):
|
||||||
if data is not None:
|
if data is not None:
|
||||||
identity_data = IdentityData(
|
identity_data = IdentityData(
|
||||||
|
|
Loading…
Reference in New Issue