Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=8dbb3edbed39503f6c7da3aa9974a7f4156cced0
commit 8dbb3edbed39503f6c7da3aa9974a7f4156cced0 Author: bouleetbil <bouleet...@frogdev.info> Date: Wed Apr 20 21:33:36 2011 +0200 systemd-24-6-x86_64 *use prefdm diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index a46302d..8ee543f 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -12,7 +12,7 @@ fi pkgname=systemd pkgver=24 -pkgrel=5 +pkgrel=6 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd"; depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 'sysvinit-tools') @@ -23,7 +23,7 @@ source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ console.conf enable-plymouth.diff) sha1sums=('6eb502ec8c9573fd769dab3ca8a2fc5ed8ce2680' \ 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \ - '9290c4913a070a716ac56d673b9a8f52eaac529e') + '36405813634ebaeb9b877ac338d7e06989e92051') if Fuse $USE_CRYPTSETUP; then depends=("${depends[@]}" 'cryptsetup-luks') diff --git a/source/base/systemd/enable-plymouth.diff b/source/base/systemd/enable-plymouth.diff index 285ea5a..4fe5bcd 100644 --- a/source/base/systemd/enable-plymouth.diff +++ b/source/base/systemd/enable-plymouth.diff @@ -9,15 +9,21 @@ altlinux) SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d --- systemd-24/units/frugalware/display-manager.service.old 2011-03-16 03:53:55.000000000 +0100 -+++ systemd-24/units/frugalware/display-manager.service 2011-04-19 04:01:33.000000000 +0200 -@@ -9,8 +9,8 @@ ++++ systemd-24/units/frugalware/display-manager.service 2011-03-20 21:18:09.000000000 +0100 +@@ -9,11 +9,12 @@ Description=Display Manager After=syslog.target local.service systemd-user-sessions.service -Conflicts=splashy-quit.service -After=splashy-quit.service -+Conflicts=plymouth-quit.service -+After=plymouth-quit.service ++# On Frugalware X11 is on tty12. We explicitly cancel the getty here to ++# avoid any races around that. ++Conflicts=getty@tty12.service plymouth-quit.service ++After=getty@tty12.service plymouth-quit.service [Service] - EnvironmentFile=/etc/sysconfig/desktop +-EnvironmentFile=/etc/sysconfig/desktop +-ExecStart=/bin/bash -c "exec ${desktop}" ++ExecStart=/usr/bin/prefdm -nodaemon + Restart=always + RestartSec=0 _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
