Merge pull request #1 from archlinux/master

Sync to master
This commit is contained in:
Insanemal 2021-04-08 14:11:23 +10:00 committed by GitHub
commit 303dbd567a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 23 deletions

View File

@ -147,7 +147,7 @@ class Installer():
self.log(f"Updating {self.mountpoint}/etc/fstab", level=LOG_LEVELS.Info) self.log(f"Updating {self.mountpoint}/etc/fstab", level=LOG_LEVELS.Info)
fstab = sys_command(f'/usr/bin/genfstab {flags} {self.mountpoint}').trace_log fstab = sys_command(f'/usr/bin/genfstab {flags} {self.mountpoint}').trace_log
with open(f"{self.mountpoint}/etc/fstab", 'ab') as fstab_fh: with open(f"{self.mountpoint}/etc/fstab", 'ab',newline='\n') as fstab_fh:
fstab_fh.write(fstab) fstab_fh.write(fstab)
if not os.path.isfile(f'{self.mountpoint}/etc/fstab'): if not os.path.isfile(f'{self.mountpoint}/etc/fstab'):

View File

@ -1,31 +1,28 @@
# Pull Request Template 🚨 PR Guidelines:
Make sure you've checked out the [contribution guideline](https://github.com/archlinux/archinstall/blob/master/CONTRIBUTING.md).<br> # New features *(v2.2.0)*
Most of the guidelines are not enforced, but is heavily encouraged.
## Description Merge new features in to `torxed-v2.2.0`.<br>
This branch is designated for potential breaking changes, added complexity and new functionality.
Please include a summary of the change and which issue is fixed.<br> # Bug fixes *(v2.1.4)*
It is also helpful to add links to online documentation or to the implementation of the code you are changing.
## Bugs and Issues Merge against `master` for bug fixes and anything that improves stability and quality of life.<br>
This excludes:
* New functionality
* Added complexity
* Breaking changes
If this pull-request fixes an issue or a bug, please mention the issues with the approriate issue referece *(Example: &#35;8)*. Any changes to `master` automatically gets pulled in to `torxed-v2.2.0` to avoid merge hell.
## How Has This Been Tested? # Describe your PR
If possible, mention any tests you have made with the current code base included in the pull-requests.<br> If the changes has been discussed in an Issue, please tag it so we can backtrace from the Issue later on.<br>
Any core-developer will also run tests, but this helps speed things up. Below is a template that can be used: If the PR is larger than ~20 lines, please describe it here unless described in an issue.
As an example: # Testing
**Test Configuration**: Any new feature or stability improvement should be tested if possible.
* Hardware: VirtualBox 6.1 Please follow the test instructions at the bottom of the README.
* Specific steps: Ran installer with additional packages `nano` and `wget`
## Checklist: *These PR guidelines will change after 2021-05-01, which is when `v2.1.4` gets onto the new ISO*
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code to the best of my abilities
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation where possible/if applicable

View File

@ -1,4 +1,4 @@
import archinstall import archinstall
installation.add_additional_packages("gnome gnome-tweaks gnome-todo gnome-sound-recorder gdm") installation.add_additional_packages("gnome gnome-tweaks gdm")
# Note: gdm should be part of the gnome group, but adding it here for clarity # Note: gdm should be part of the gnome group, but adding it here for clarity