Skip to content

Commit c92a457

Browse files
authored
Revert "Locale timezone python chmod (archlinux#4210)" (archlinux#4257)
This reverts commit 01d3af9.
1 parent 01d3af9 commit c92a457

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

archinstall/lib/installer.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,6 @@ def minimal_installation(
891891
mkinitcpio: bool = True,
892892
hostname: str | None = None,
893893
locale_config: LocaleConfiguration | None = LocaleConfiguration.default(),
894-
timezone: str | None = None,
895894
) -> None:
896895
if self._disk_config.lvm_config:
897896
lvm = 'lvm2'
@@ -948,22 +947,19 @@ def minimal_installation(
948947
if not self._disable_fstrim:
949948
self.enable_periodic_trim()
950949

950+
# TODO: Support locale and timezone
951+
# os.remove(f'{self.target}/etc/localtime')
952+
# sys_command(f'arch-chroot {self.target} ln -s /usr/share/zoneinfo/{localtime} /etc/localtime')
953+
# sys_command('arch-chroot /mnt hwclock --hctosys --localtime')
951954
if hostname:
952955
self.set_hostname(hostname)
953956

954957
if locale_config:
955958
self.set_locale(locale_config)
956959
self.set_keyboard_language(locale_config.kb_layout)
957960

958-
if timezone:
959-
if not self.set_timezone(timezone):
960-
warn(f'Failed to set timezone: {timezone}')
961-
962-
root_dir = self.target / 'root'
963-
if root_dir.exists():
964-
root_dir.chmod(0o700)
965-
else:
966-
debug(f'Root directory not found at {root_dir}, skipping chmod')
961+
# TODO: Use python functions for this
962+
self.arch_chroot('chmod 700 /root')
967963

968964
if mkinitcpio and not self.mkinitcpio(['-P']):
969965
error('Error generating initramfs (continuing anyway)')

archinstall/scripts/guided.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ def perform_installation(
102102
mkinitcpio=run_mkinitcpio,
103103
hostname=arch_config_handler.config.hostname,
104104
locale_config=locale_config,
105-
timezone=config.timezone,
106105
)
107106

108107
if mirror_config := config.mirror_config:
@@ -140,6 +139,9 @@ def perform_installation(
140139
if config.packages and config.packages[0] != '':
141140
installation.add_additional_packages(config.packages)
142141

142+
if timezone := config.timezone:
143+
installation.set_timezone(timezone)
144+
143145
if config.ntp:
144146
installation.activate_time_synchronization()
145147

0 commit comments

Comments
 (0)