Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=541163ac1dd14bb7aeb77555f0fe0146db3da23e
commit 541163ac1dd14bb7aeb77555f0fe0146db3da23e Author: Miklos Vajna <vmik...@frugalware.org> Date: Tue Dec 14 03:34:44 2010 +0100 Revert "gdm-2.32.0-2-i686" for now. diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index 03bb64c..76f8fb4 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gdm pkgver=2.32.0 -pkgrel=3 +pkgrel=1 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/"; backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin) @@ -17,11 +17,9 @@ groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome source=(${sour...@]} \ - polkit-gnome-authentication-agent-1.desktop \ - g...@.service) + polkit-gnome-authentication-agent-1.desktop) sha1sums=('f3890176f8b10022ed25f6155a98833ae8ce1ca4' \ - '93d1f9a7d068dd8e70c930abea9acf5b770a3485' \ - '7169b6dfaeda1f8712dfa7d3ba3920f9ac900494') + '93d1f9a7d068dd8e70c930abea9acf5b770a3485') conflicts=('fast-user-switch-applet') provides=('fast-user-switch-applet' 'gdm-themes' 'somatic-gdm-themes' 'arc-colors-gdm-themes') @@ -70,9 +68,6 @@ session required pam_unix.so EOF #bash completion fix Fsed "#!/bin/sh" "#!/bin/bash" $Fdestdir/usr/sbin/gdm - - Fmkdir etc/systemd/system/ - Fcp g...@.service etc/systemd/system/ } # optimization OK diff --git a/source/gnome/gdm/gdm.install b/source/gnome/gdm/gdm.install index 3be4c70..c781e15 100644 --- a/source/gnome/gdm/gdm.install +++ b/source/gnome/gdm/gdm.install @@ -21,8 +21,11 @@ post_install() echo -n "updating scrollkeeper catalogue... " rarian-sk-update -q > /dev/null 2>&1 echo "done." - systemctl enable g...@.service + + sed -i 's|usr/bin/gdm|usr/sbin/gdm|' /etc/sysconfig/desktop + sed -i 's|usr/sbin/gdm -nodaemon|usr/sbin/gdm --nodaemon|' /etc/sysconfig/desktop + sed 's|^#desktop="/usr/sbin/gdm --nodaemon"$|desktop="/usr/sbin/gdm --nodaemon"|' -i /etc/sysconfig/desktop } post_upgrade() @@ -35,7 +38,7 @@ post_remove() echo -n "updating scrollkeeper catalogue... " rarian-sk-update -q > /dev/null 2>&1 echo "done." - systemctl delete g...@.service + sed -i 's|^desktop="/usr/sbin/gdm --nodaemon"$|#desktop="/usr/sbin/gdm --nodaemon"|' /etc/sysconfig/desktop } op=$1 diff --git a/source/gnome/gdm/g...@.service b/source/gnome/gdm/g...@.service deleted file mode 100644 index ec0b08f..0000000 --- a/source/gnome/gdm/g...@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=GDM Display Manager on %I -Requires=dev-%i.device -After=dev-%i.device - -[Service] -ExecStart=/usr/sbin/gdm -StandardOutput=syslog - -[Install] -Alias=graphical.target.wants/g...@tty7.service - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
