Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c2579da8b4c17ef5b76abb8c0fcb5ea6e6e52cc

commit 5c2579da8b4c17ef5b76abb8c0fcb5ea6e6e52cc
Author: DeX77 <[email protected]>
Date:   Fri Dec 25 17:52:10 2015 +0100

sddm-0.13.0-2-x86_64

* fix sddm.conf and user creation

diff --git a/source/x11-extra/sddm/FrugalBuild 
b/source/x11-extra/sddm/FrugalBuild
index 77c9b2b..d25c0bd 100644
--- a/source/x11-extra/sddm/FrugalBuild
+++ b/source/x11-extra/sddm/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=sddm
pkgver=0.13.0
-pkgrel=1
+pkgrel=2
pkgdesc='QML based X11 display manager'
archs=('i686' 'x86_64')
groups=('x11-extra')
@@ -24,5 +24,13 @@ conflicts=('lightdm' 'lightdm-gtk-greeter' 'lightdm-kde' 
'lightdm-webkit-greeter
Finclude github cmake
sha1sums=('27df34e18c8ab602d035fe80958824ddb74effd9')

+source=("${source[@]}" \
+       sddm.conf)
+sha1sums=("${sha1sums[@]}" \
+       28bb36e8068ee32c64efcfde43a9422e901028e5)
+build() {
+       CMake_build
+       Finstall 755 /etc/sddm.conf

+}
# optimization OK
diff --git a/source/x11-extra/sddm/sddm.conf b/source/x11-extra/sddm/sddm.conf
new file mode 100644
index 0000000..41c2e95
--- /dev/null
+++ b/source/x11-extra/sddm/sddm.conf
@@ -0,0 +1,105 @@
+[Autologin]
+# Autologin again on session exit
+Relogin=false
+
+# Autologin session
+Session=
+
+# Autologin user
+User=
+
+
+[General]
+# Halt command
+HaltCommand=/usr/bin/systemctl poweroff
+
+# Initial NumLock state
+# Valid values: on|off|none
+# If property is set to none, numlock won't be changed
+Numlock=none
+
+# Reboot command
+RebootCommand=/usr/bin/systemctl reboot
+
+
+[Theme]
+# Current theme name
+Current=maui
+
+# Cursor theme
+CursorTheme=
+
+# Face icon directory
+# The files should be in username.face.icon format
+FacesDir=/usr/share/sddm/faces
+
+# Theme directory path
+ThemeDir=/usr/share/sddm/themes
+
+
+[Users]
+# Default $PATH
+DefaultPath=/bin:/usr/bin:/usr/local/bin
+
+# Hidden shells
+# Users with these shells as their default won't be listed
+HideShells=
+
+# Hidden users
+HideUsers=
+
+# Maximum user id for displayed users
+MaximumUid=60000
+
+# Minimum user id for displayed users
+MinimumUid=1000
+
+# Remember the session of the last successfully logged in user
+RememberLastSession=true
+
+# Remember the last successfully logged in user
+RememberLastUser=true
+
+
+[WaylandDisplay]
+# Wayland session script path
+# A script to execute when starting the desktop session
+SessionCommand=/usr/share/sddm/scripts/wayland-session
+
+# Session description directory
+SessionDir=/usr/share/wayland-sessions
+
+
+[XDisplay]
+# Xsetup script path
+# A script to execute when starting the display server
+DisplayCommand=/usr/share/sddm/scripts/Xsetup
+
+# Xstop script path
+# A script to execute when stopping the display server
+DisplayStopCommand=/usr/share/sddm/scripts/Xstop
+
+# Minimum VT
+# The lowest virtual terminal number that will be used.
+MinimumVT=12
+
+# X server arguments
+ServerArguments=-nolisten tcp
+
+# X server path
+ServerPath=/usr/bin/X
+
+# Xsession script path
+# A script to execute when starting the desktop session
+SessionCommand=/usr/share/sddm/scripts/Xsession
+
+# Session description directory
+SessionDir=/etc/X11/sessions
+
+# Xauth path
+XauthPath=/usr/bin/xauth
+
+# Xephyr path
+XephyrPath=/usr/bin/Xephyr
+
+
diff --git a/source/x11-extra/sddm/sddm.install 
b/source/x11-extra/sddm/sddm.install
index 5e7ccc2..feb0f85 100644
--- a/source/x11-extra/sddm/sddm.install
+++ b/source/x11-extra/sddm/sddm.install
@@ -1,7 +1,7 @@
post_install()
{
-       getent group sddm > /dev/null 2>&1 || groupadd -g 631 sddm
-       getent passwd sddm > /dev/null 2>&1 || useradd -c 'Simple Display 
Manager' -u 631 -g sddm -d /var/lib/sddm -s /sbin/nologin -m sddm
+       getent group sddm > /dev/null 2>&1 || /usr/sbin/groupadd -g 631 sddm
+       getent passwd sddm > /dev/null 2>&1 || /usr/sbin/useradd -c 'Simple 
Display Manager' -u 631 -g sddm -d /var/lib/sddm -s /sbin/nologin -m sddm
passwd -l sddm > /dev/null
}

@@ -18,8 +18,8 @@ pre_remove()

post_remove()
{
-       getent passwd sddm > /dev/null 2>&1 && userdel sddm
-       getent group sddm > /dev/null 2>&1 && groupdel sddm
+       getent passwd sddm > /dev/null 2>&1 && /usr/sbin/userdel sddm
+       getent group sddm > /dev/null 2>&1 && /usr/sbin/groupdel sddm
systemctl daemon-reload >/dev/null 2>&1
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to