diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf index 7975324b0..a47783811 100644 --- a/src/modules/bootloader/bootloader.conf +++ b/src/modules/bootloader/bootloader.conf @@ -5,15 +5,15 @@ efiBootLoader: "grub" # systemd-boot configuration files settings, set kernel and initramfs file names # and amount of time before default selection boots -kernel: "/vmlinuz-linux" -img: "/initramfs-linux.img" -fallback: "/initramfs-linux-fallback.img" +kernel: "_ALL_kver_" +img: "_default_image_" +fallback: "_fallback_image_" timeout: "10" # Optionally set the menu entry name and kernel name to use in systemd-boot. # If not specified here, these settings will be taken from branding.desc. -# bootloaderEntryName: "Generic GNU/Linux" -# kernelLine: ", with Stable-Kernel" -# fallbackKernelLine: ", with Stable-Kernel (fallback initramfs)" +# bootloaderEntryName: "Manjaro" +kernelLine: ", with _manjaro_kernel_" +fallbackKernelLine: ", with _manjaro_kernel_ (fallback initramfs)" # GRUB 2 binary names and boot directory # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. diff --git a/src/modules/initcpio/initcpio.conf b/src/modules/initcpio/initcpio.conf index 21f5704cc..b7161e5ae 100644 --- a/src/modules/initcpio/initcpio.conf +++ b/src/modules/initcpio/initcpio.conf @@ -1,2 +1,2 @@ --- -kernel: linux312 +kernel: _kernel_ diff --git a/src/modules/locale/locale.conf b/src/modules/locale/locale.conf index 2e3b79999..381707de7 100644 --- a/src/modules/locale/locale.conf +++ b/src/modules/locale/locale.conf @@ -1,5 +1,5 @@ --- region: "America" zone: "New_York" -#localeGenPath: "/etc/locale.gen" -#geoipUrl: "freegeoip.net" +localeGenPath: "/etc/locale.gen" +geoipUrl: "freegeoip.net" diff --git a/src/modules/services/services.conf b/src/modules/services/services.conf index 50069e696..2351b38a9 100644 --- a/src/modules/services/services.conf +++ b/src/modules/services/services.conf @@ -5,7 +5,7 @@ services: - name: "NetworkManager" #name of the service file mandatory: false #true=> if enabling fails the installer errors out and quits #false=>if enabling fails print warning to console and continue - - name: "cups" + - name: "org.cups.cupsd" mandatory: false targets: diff --git a/src/modules/unpackfs/unpackfs.conf b/src/modules/unpackfs/unpackfs.conf index 68de113b5..755fc77c5 100644 --- a/src/modules/unpackfs/unpackfs.conf +++ b/src/modules/unpackfs/unpackfs.conf @@ -1,8 +1,8 @@ --- unpack: - - source: "/path/to/filesystem.img" - sourcefs: "ext4" - destination: "" - - source: "/path/to/another/filesystem.sqfs" + - source: "_root-image_" + sourcefs: "squashfs" + destination: "" + - source: "_desktop-image_" sourcefs: "squashfs" destination: "" diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf index 34a5fcfc9..a7dedf671 100644 --- a/src/modules/users/users.conf +++ b/src/modules/users/users.conf @@ -6,7 +6,6 @@ defaultGroups: - network - storage - wheel - - audio autologinGroup: autologin doAutologin: true sudoersGroup: wheel