root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

Merge branch 'devel' of github.com:manjaro/manjaro-tools

Browse source
This commit is contained in:
udeved 2016-03-08 18:33:12 +01:00
commit 78cb2f526e
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,4 +1,4 @@
Version=0.11.3 Version=0.11.4
PREFIX = /usr/local PREFIX = /usr/local
SYSCONFDIR = /etc SYSCONFDIR = /etc

8
data/desktop.map
View file

@ -1,4 +1,9 @@
openbox:openbox-session openbox:openbox-session
bspwm:bspwm-session
jwm:jwm
i3:i3
fluxbox:startfluxbox
pekwm:pekwm
plasma:startkde plasma:startkde
gnome:gnome-session gnome:gnome-session
xfce:startxfce4 xfce:startxfce4
@ -7,9 +12,6 @@ mate:mate-session
enlightenment:enlightenment_start enlightenment:enlightenment_start
LXDE:lxsession LXDE:lxsession
lxqt:lxqt-session lxqt:lxqt-session
pekwm:pekwm
pantheon:pantheon-session pantheon:pantheon-session
budgie-desktop:budgie-desktop budgie-desktop:budgie-desktop
i3:i3
fluxbox:startfluxbox
deepin:startdde deepin:startdde

2
lib/util-iso-image.sh
View file

@ -376,7 +376,7 @@ configure_root_image(){
configure_custom_image(){ configure_custom_image(){
msg "Configuring [%s-image]" "${profile}" msg "Configuring [%s-image]" "${profile}"
configure_plymouth "$1" configure_plymouth "$1"
configure_displaymanager "$1" [[ ${displaymanager} != 'none' ]] && configure_displaymanager "$1"
configure_services "$1" configure_services "$1"
msg "Done configuring [%s-image]" "${profile}" msg "Done configuring [%s-image]" "${profile}"
} }