Skip to content

Commit d429bf1

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 9250e4b + 111899e commit d429bf1

File tree

4 files changed

+3
-9
lines changed

4 files changed

+3
-9
lines changed

settings.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ sequence:
102102
- keyboard
103103
- localecfg
104104
- shellprocess
105-
- packages
106105
- luksopenswaphookcfg
107106
- luksbootkeyfile
108107
- plymouthcfg
@@ -113,6 +112,7 @@ sequence:
113112
- displaymanager
114113
- networkcfg
115114
- hwclock
115+
- packages
116116
- services-systemd
117117
- grubcfg
118118
- bootloader

src/modules/bootloader/bootloader.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ timeout: "10"
1616
# Optionally set the menu entry name and kernel name to use in systemd-boot.
1717
# If not specified here, these settings will be taken from branding.desc.
1818
#
19-
bootloaderEntryName: "AlterLinux"
19+
bootloaderEntryName: "Alter Linux"
2020
kernelLine: ", with _alter_kernel_"
2121
fallbackKernelLine: ", with _alter_kernel_ (fallback initramfs)"
2222

src/modules/displaymanager/displaymanager.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ displaymanagers:
1919
- gdm
2020
- mdm
2121
- lxdm
22-
- kdm
22+
# - kdm
2323

2424
# Enable the following settings to force a desktop environment
2525
# in your displaymanager configuration file. This will attempt

src/modules/packages/packages.conf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,4 @@ operations:
166166
# - install:
167167
- remove:
168168
- alterlinux-calamares
169-
- boost-libs
170-
- kpmcore
171-
- plasma-framework
172-
- qt5-xmlpatterns
173-
- squashfs-tools
174-
- yaml-cpp
175169
- arch-install-scripts

0 commit comments

Comments
 (0)