packages: systemd/target-pld.patch - instead of hacking into fedora specifi...

baggins baggins at pld-linux.org
Thu Mar 15 12:27:39 CET 2012


Author: baggins                      Date: Thu Mar 15 11:27:39 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- instead of hacking into fedora specific services provide our own

---- Files affected:
packages/systemd:
   target-pld.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/systemd/target-pld.patch
diff -u packages/systemd/target-pld.patch:1.5 packages/systemd/target-pld.patch:1.6
--- packages/systemd/target-pld.patch:1.5	Thu Feb 16 11:57:55 2012
+++ packages/systemd/target-pld.patch	Thu Mar 15 12:27:34 2012
@@ -29,8 +29,8 @@
  
 +if TARGET_PLD
 +dist_systemunit_DATA += \
-+	units/fedora/rc-local.service \
-+	units/fedora/halt-local.service
++	units/pld/prefdm.service \
++	units/pld/halt-local.service
 +systemgenerator_PROGRAMS += \
 +	systemd-rc-local-generator
 +endif
@@ -261,3 +261,50 @@
  #define SCRIPT_PATH "/etc/rc.d/rc.local"
  #elif defined(TARGET_SUSE)
  #define SCRIPT_PATH "/etc/init.d/boot.local"
+--- /dev/null
++++ b/units/pld/halt-local.service
+@@ -0,0 +1,20 @@
++#  This file is part of systemd.
++#
++#  systemd is free software; you can redistribute it and/or modify it
++#  under the terms of the GNU General Public License as published by
++#  the Free Software Foundation; either version 2 of the License, or
++#  (at your option) any later version.
++
++[Unit]
++Description=/sbin/halt.local Compatibility
++ConditionFileIsExecutable=/sbin/halt.local
++DefaultDependencies=no
++After=shutdown.target
++Before=final.target
++
++[Service]
++Type=oneshot
++ExecStart=/sbin/halt.local
++TimeoutSec=0
++StandardOutput=tty
++RemainAfterExit=yes
+--- /dev/null
++++ b/units/pld/prefdm.service
+@@ -0,0 +1,21 @@
++#  This file is part of systemd.
++#
++#  systemd is free software; you can redistribute it and/or modify it
++#  under the terms of the GNU General Public License as published by
++#  the Free Software Foundation; either version 2 of the License, or
++#  (at your option) any later version.
++
++[Unit]
++Description=Display Manager
++After=livesys-late.service rc-local.service systemd-user-sessions.service
++After=network.target acpid.service
++
++# Do not stop plymouth, it is done in prefdm if required
++Conflicts=plymouth-quit.service
++After=plymouth-quit.service
++
++[Service]
++ExecStart=/etc/X11/xinit/prefdm -nodaemon
++Restart=always
++RestartSec=0
++IgnoreSIGPIPE=no
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/target-pld.patch?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list