mirrors/mbp-manjaro
mirrors
/
mbp-manjaro
mirror of https://github.com/JPyke3/mbp-manjaro
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fhdk 2018-10-02 09:11:46 +02:00
parent 0c7677f592 ce613d8fc6
commit 5567971128
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shared/manjaro/live-overlay/etc/default/grub
View File

@ -1,7 +1,7 @@
GRUB_DEFAULT=saved
GRUB_TIMEOUT=5
GRUB_DISTRIBUTOR="Manjaro"
GRUB_CMDLINE_LINUX_DEFAULT="quiet loglevel=3 vga=current rd.systemd.show_status=auto rd.udev.log-priority=3 vt.global_cursor_default=0"
GRUB_CMDLINE_LINUX_DEFAULT=""
GRUB_CMDLINE_LINUX=""
# If you want to enable the save default function, uncomment the following
@ -42,7 +42,7 @@ GRUB_COLOR_NORMAL="light-gray/black"
GRUB_COLOR_HIGHLIGHT="green/black"
# Uncomment one of them for the gfx desired, a image background or a gfxtheme
GRUB_BACKGROUND="/usr/share/grub/background.png"
#GRUB_BACKGROUND="/usr/share/grub/background.png"
#GRUB_THEME="/path/to/gfxtheme"
# Uncomment to get a beep at GRUB start

8
shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
View File

@ -4,10 +4,10 @@ componentName: manjaro
strings:
productName: Manjaro Linux
shortProductName: Manjaro
version: 18.0-beta-6
shortVersion: 18.0-beta-6
versionedName: Manjaro Linux 18.0-beta-6 "Illyria"
shortVersionedName: Manjaro 18.0-beta-6
version: 18.0-beta-7
shortVersion: 18.0-beta-7
versionedName: Manjaro Linux 18.0-beta-7 "Illyria"
shortVersionedName: Manjaro 18.0-beta-7
bootloaderEntryName: Manjaro
images: