Skip to content

Commit 81b9f6c

Browse files
luca020400luca020400
committed
Add support for systemd-homed
1 parent d40d77c commit 81b9f6c

5 files changed

Lines changed: 126 additions & 22 deletions

File tree

‎archinstall/lib/disk/device_handler.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,15 @@ def format(
271271
options = []
272272

273273
match fs_type:
274-
case FilesystemType.Btrfs | FilesystemType.F2fs | FilesystemType.Xfs:
274+
case FilesystemType.Btrfs | FilesystemType.Xfs:
275275
# Force overwrite
276276
options.append('-f')
277+
case FilesystemType.F2fs:
278+
# Force overwrite and enable encrypt
279+
options.extend(('-f', '-O', 'encrypt'))
277280
case FilesystemType.Ext2 | FilesystemType.Ext3 | FilesystemType.Ext4:
278-
# Force create
279-
options.append('-F')
281+
# Force create and enable encrypt
282+
options.extend(('-F', '-O', 'encrypt'))
280283
case FilesystemType.Fat12 | FilesystemType.Fat16 | FilesystemType.Fat32:
281284
mkfs_type = 'fat'
282285
# Set FAT size

‎archinstall/lib/installer.py‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
from .args import arch_config_handler
3838
from .exceptions import DiskError, HardwareIncompatibilityError, RequirementError, ServiceException, SysCallError
39-
from .general import SysCommand, run
39+
from .general import SysCommand, SysCommandWorker, run
4040
from .hardware import SysInfo
4141
from .locale.utils import verify_keyboard_layout, verify_x11_keyboard_layout
4242
from .luks import Luks2
@@ -1701,27 +1701,48 @@ def _create_user(self, user: User) -> None:
17011701
if not handled_by_plugin:
17021702
info(f'Creating user {user.username}')
17031703

1704-
cmd = f'arch-chroot {self.target} useradd -m'
1704+
if user.homed.use_homed:
1705+
self.enable_service('systemd-homed')
17051706

1706-
if user.sudo:
1707-
cmd += ' -G wheel'
1707+
homed_groups = []
1708+
if user.sudo:
1709+
homed_groups.append('wheel')
1710+
homed_groups.extend(user.groups)
17081711

1709-
cmd += f' {user.username}'
1712+
cmd = f'homectl create --enforce-password-policy=no'
1713+
cmd += f' --member-of {",".join(homed_groups)}' if homed_groups else ''
1714+
cmd += f' --storage {user.homed.storage_mechanism}'
1715+
cmd += f' {user.username}'
17101716

1711-
try:
1712-
SysCommand(cmd)
1713-
except SysCallError as err:
1714-
raise SystemError(f'Could not create user inside installation: {err}')
1717+
from .boot import Boot
1718+
1719+
with Boot(self) as session:
1720+
worker = session.SysCommandWorker(cmd.split(" "))
1721+
while worker.is_alive():
1722+
worker.write(bytes(f'{user.password.plaintext}\n', 'UTF-8'), line_ending=False)
1723+
else:
1724+
cmd = f'arch-chroot {self.target} useradd -m'
1725+
1726+
if user.sudo:
1727+
cmd += ' -G wheel'
1728+
1729+
cmd += f' {user.username}'
1730+
1731+
try:
1732+
SysCommand(cmd)
1733+
except SysCallError as err:
1734+
raise SystemError(f'Could not create user inside installation: {err}')
17151735

17161736
for plugin in plugins.values():
17171737
if hasattr(plugin, 'on_user_created'):
17181738
if result := plugin.on_user_created(self, user):
17191739
handled_by_plugin = result
17201740

1721-
self.set_user_password(user)
1741+
if not user.homed.use_homed:
1742+
self.set_user_password(user)
17221743

1723-
for group in user.groups:
1724-
SysCommand(f'arch-chroot {self.target} gpasswd -a {user.username} {group}')
1744+
for group in user.groups:
1745+
SysCommand(f'arch-chroot {self.target} gpasswd -a {user.username} {group}')
17251746

17261747
if user.sudo:
17271748
self.enable_sudo(user)

‎archinstall/lib/interactions/manage_users_conf.py‎

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
from archinstall.tui.curses_menu import EditMenu, SelectMenu
88
from archinstall.tui.menu_item import MenuItem, MenuItemGroup
99
from archinstall.tui.result import ResultType
10-
from archinstall.tui.types import Alignment, Orientation
10+
from archinstall.tui.types import Alignment, FrameProperties, Orientation
1111

1212
from ..menu.list_manager import ListManager
13-
from ..models.users import User
13+
from ..models.users import User, StorageMechanism, HomedConfiguration
1414
from ..utils.util import get_password
1515

1616

@@ -111,7 +111,55 @@ def _add_user(self) -> User | None:
111111
case _:
112112
raise ValueError('Unhandled result type')
113113

114-
return User(username, password, sudo)
114+
homed_configuration = self._configure_homed()
115+
116+
return User(username, password, sudo, homed_configuration)
117+
118+
119+
def _configure_homed(self) -> HomedConfiguration:
120+
header = str(tr('Should the user use systemd-homed?\n'))
121+
122+
group = MenuItemGroup.yes_no()
123+
group.focus_item = MenuItem.no()
124+
125+
result = SelectMenu[bool](
126+
group,
127+
header=header,
128+
alignment=Alignment.CENTER,
129+
columns=2,
130+
orientation=Orientation.HORIZONTAL,
131+
search_enabled=False,
132+
allow_skip=False,
133+
).run()
134+
135+
match result.type_:
136+
case ResultType.Selection:
137+
if result.item() != MenuItem.yes():
138+
return HomedConfiguration(use_homed=False)
139+
case _:
140+
raise ValueError('Unhandled result type')
141+
142+
items = [
143+
MenuItem('Directory', value=StorageMechanism.DIRECTORY),
144+
MenuItem('LUKS', value=StorageMechanism.LUKS),
145+
MenuItem('fscrypt', value=StorageMechanism.FSCRYPT),
146+
]
147+
148+
group = MenuItemGroup(items, sort_items=False)
149+
result = SelectMenu[StorageMechanism](
150+
group,
151+
alignment=Alignment.CENTER,
152+
frame=FrameProperties.min('Filesystem'),
153+
allow_skip=False,
154+
).run()
155+
156+
match result.type_:
157+
case ResultType.Selection:
158+
return HomedConfiguration(use_homed=True, storage_mechanism=result.item().value)
159+
case _:
160+
raise ValueError('Unhandled result type')
161+
162+
return HomedConfiguration(use_homed=False)
115163

116164

117165
def ask_for_additional_users(prompt: str = '', defined_users: list[User] = []) -> list[User]:

‎archinstall/lib/models/users.py‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,40 @@ def _check_password_strength(
100100
return PasswordStrength.VERY_WEAK
101101

102102

103+
104+
class StorageMechanism:
105+
DIRECTORY = 'directory'
106+
LUKS = 'luks'
107+
FSCRYPT = 'fscrypt'
108+
109+
110+
class HomedConfiguration:
111+
def __init__(
112+
self,
113+
use_homed: bool,
114+
storage_mechanism: StorageMechanism | None = None,
115+
):
116+
self.use_homed = use_homed
117+
self.storage_mechanism = storage_mechanism
118+
119+
@override
120+
def __eq__(self, other: object) -> bool:
121+
if not isinstance(other, HomedConfiguration):
122+
return NotImplemented
123+
124+
return (
125+
self.use_homed == other.use_homed
126+
and self.storage_mechanism == other.storage_mechanism
127+
)
128+
129+
103130
UserSerialization = TypedDict(
104131
'UserSerialization',
105132
{
106133
'username': str,
107134
'!password': NotRequired[str],
108135
'sudo': bool,
136+
'homed': HomedConfiguration,
109137
'groups': list[str],
110138
'enc_password': str | None,
111139
},
@@ -158,18 +186,20 @@ class User:
158186
username: str
159187
password: Password
160188
sudo: bool
189+
homed: HomedConfiguration
161190
groups: list[str] = field(default_factory=list)
162191

163192
@override
164193
def __str__(self) -> str:
165194
# safety overwrite to make sure password is not leaked
166-
return f'User({self.username=}, {self.sudo=}, {self.groups=})'
195+
return f'User({self.username=}, {self.sudo=}, {self.homed}, {self.groups=})'
167196

168-
def table_data(self) -> dict[str, str | bool | list[str]]:
197+
def table_data(self) -> dict[str, str | str | bool | bool | list[str]]:
169198
return {
170199
'username': self.username,
171200
'password': self.password.hidden(),
172201
'sudo': self.sudo,
202+
'homed': self.homed.use_homed,
173203
'groups': self.groups,
174204
}
175205

@@ -178,6 +208,7 @@ def json(self) -> UserSerialization:
178208
'username': self.username,
179209
'enc_password': self.password.enc_password,
180210
'sudo': self.sudo,
211+
'homed': self.homed,
181212
'groups': self.groups,
182213
}
183214

@@ -208,6 +239,7 @@ def parse_arguments(
208239
username=username,
209240
password=password,
210241
sudo=entry.get('sudo', False) is True,
242+
homed=entry.get('homed', HomedConfiguration(use_homed=False)),
211243
groups=groups,
212244
)
213245

‎archinstall/scripts/guided.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
DiskLayoutType,
1717
EncryptionType,
1818
)
19-
from archinstall.lib.models.users import User
19+
from archinstall.lib.models.users import User, HomedConfiguration
2020
from archinstall.lib.output import debug, error, info
2121
from archinstall.lib.packages.packages import check_package_upgrade
2222
from archinstall.lib.profile.profiles_handler import profile_handler
@@ -139,7 +139,7 @@ def perform_installation(mountpoint: Path) -> None:
139139
installation.enable_espeakup()
140140

141141
if config.auth_config and config.auth_config.root_enc_password:
142-
root_user = User('root', config.auth_config.root_enc_password, False)
142+
root_user = User('root', config.auth_config.root_enc_password, False, HomedConfiguration(False))
143143
installation.set_user_password(root_user)
144144

145145
if (profile_config := config.profile_config) and profile_config.profile:

0 commit comments

Comments
 (0)