From 40c6aad0ed68ba8c3a5e98084f923d7840f4ed4e Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 15:32:29 +0530 Subject: xfs as partition option --- archinstall/lib/disk.py | 4 ++++ archinstall/lib/installer.py | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index 80dc4735..35ff5712 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -134,6 +134,10 @@ class Partition(): if (handle := sys_command(f'/usr/bin/mkfs.ext4 -F {self.path}')).exit_code != 0: raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}') self.filesystem = 'ext4' + elif filesystem == 'xfs': + if (handle:= sys_command(f'/usr/bin/mkfs.xfs -f {self.path}')).exit_code != 0: + raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}') + self.filesystem = 'xfs' else: raise DiskError(f'Fileformat {filesystem} is not yet implemented.') return True diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index e4219323..a193a812 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -190,7 +190,8 @@ class Installer(): if self.partition.filesystem == 'btrfs': #if self.partition.encrypted: self.base_packages.append('btrfs-progs') - + if self.part.filesystem == 'xfs': + self.base_packages.append('xfsprogs') self.pacstrap(self.base_packages) #self.genfstab() @@ -310,4 +311,4 @@ class Installer(): with open(f'{self.mountpoint}/etc/vconsole.conf', 'w') as vconsole: vconsole.write(f'KEYMAP={language}\n') vconsole.write(f'FONT=lat9w-16\n') - return True \ No newline at end of file + return True -- cgit v1.2.3-54-g00ecf From 905f10e9d24e5d07afbd4e5293ed1124cba2edef Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 16:18:12 +0530 Subject: fixed tabs and spaces problem --- archinstall/lib/disk.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index 35ff5712..e9fa12a0 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -134,10 +134,10 @@ class Partition(): if (handle := sys_command(f'/usr/bin/mkfs.ext4 -F {self.path}')).exit_code != 0: raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}') self.filesystem = 'ext4' - elif filesystem == 'xfs': - if (handle:= sys_command(f'/usr/bin/mkfs.xfs -f {self.path}')).exit_code != 0: - raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}') - self.filesystem = 'xfs' + elif filesystem == 'xfs': + if (handle:= sys_command(f'/usr/bin/mkfs.xfs -f {self.path}')).exit_code != 0: + raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}') + self.filesystem = 'xfs' else: raise DiskError(f'Fileformat {filesystem} is not yet implemented.') return True -- cgit v1.2.3-54-g00ecf From eb3526523421d420fac8191cacb9f5eda1056e52 Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 16:57:33 +0530 Subject: fixex spaces in installer.py --- archinstall/lib/installer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index a193a812..fb4b0abf 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -190,8 +190,8 @@ class Installer(): if self.partition.filesystem == 'btrfs': #if self.partition.encrypted: self.base_packages.append('btrfs-progs') - if self.part.filesystem == 'xfs': - self.base_packages.append('xfsprogs') + if self.part.filesystem == 'xfs': + self.base_packages.append('xfsprogs') self.pacstrap(self.base_packages) #self.genfstab() -- cgit v1.2.3-54-g00ecf From a54c6e3c2f702d5a5364903bc5a5d20bc6e097ec Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 17:08:35 +0530 Subject: replced slef.part with self.partition --- archinstall/lib/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index fb4b0abf..8c22b51f 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -190,7 +190,7 @@ class Installer(): if self.partition.filesystem == 'btrfs': #if self.partition.encrypted: self.base_packages.append('btrfs-progs') - if self.part.filesystem == 'xfs': + if self.partition.filesystem == 'xfs': self.base_packages.append('xfsprogs') self.pacstrap(self.base_packages) #self.genfstab() -- cgit v1.2.3-54-g00ecf