[packages/systemd.git] / target-pld.patch

diff --git a/Makefile.am b/Makefile.am
index 170465a..bce467d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -115,6 +115,12 @@ AM_CPPFLAGS += \
 	-DKBD_SETFONT=\"/usr/bin/setfont\" \
 	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_PLD
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
 	-DKBD_SETFONT=\"/bin/setfont\" \
@@ -132,6 +138,7 @@ endif
 endif
 endif
 endif
+endif
 
 rootbin_PROGRAMS = \
 	systemd \
@@ -381,6 +388,14 @@
 	systemd-rc-local-generator
 endif
 
+if TARGET_PLD
+dist_systemunit_DATA += \
+	units/pld/prefdm.service \
+	units/pld/halt-local.service
+systemgenerator_PROGRAMS += \
+	systemd-rc-local-generator
+endif
+
 if TARGET_MANDRIVA
 dist_systemunit_DATA += \
 	units/mandriva/prefdm.service \
@@ -1992,6 +1999,23 @@ if TARGET_FEDORA
 		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
+if TARGET_PLD
+	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+		rm -f rc-local.service && \
+		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+		rm -f halt-local.service && \
+		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f display-manager.service single.service && \
+		$(LN_S) prefdm.service display-manager.service && \
+		$(LN_S) rescue.service single.service )
+	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
+		rm -f display-manager.service && \
+		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
+endif
+
 if TARGET_MANDRIVA
 	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
 	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
diff --git a/configure.ac b/configure.ac
index 596a32a..f701bfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,6 +449,12 @@ case $with_distro in
                 M4_DEFINES=-DTARGET_MANDRIVA=1
                 have_plymouth=yes
                 ;;
+        pld)
+    		SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
+    		SYSTEM_SYSVRCND_PATH=/etc/rc.d
+    		AC_DEFINE(TARGET_PLD, [], [Target is PLD Linux])
+    		M4_DISTRO_FLAG=-DTARGET_PLD=1
+    		;;
         angstrom)
                 SYSTEM_SYSVRCND_PATH=/etc
                 AC_DEFINE(TARGET_ANGSTROM, [], [Target is Ångström])
@@ -510,6 +517,7 @@ if test -n "$enable_plymouth"; then
 fi
 
 AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
+AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
 AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
 AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
 AM_CONDITIONAL(TARGET_UBUNTU, test x"$with_distro" = xubuntu)
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 3477ba1..d32718d 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -127,7 +127,7 @@ static int parse_proc_cmdline(void) {
                         arg_skip = true;
                 else if (startswith(w, "fsck"))
                         log_warning("Invalid fsck parameter. Ignoring.");
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
                 else if (strneq(w, "fastboot", l))
                         arg_skip = true;
                 else if (strneq(w, "forcefsck", l))
diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index 2c2f10c..754f0c7 100644
--- a/src/core/hostname-setup.c
+++ b/src/core/hostname-setup.c
@@ -30,7 +30,7 @@
 #include "util.h"
 #include "log.h"
 
-#if defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+#if defined(TARGET_PLD) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
 #define FILENAME "/etc/sysconfig/network"
 #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
 #define FILENAME "/etc/HOSTNAME"
@@ -64,7 +64,7 @@ static int read_and_strip_hostname(const char *path, char **hn) {
 
 static int read_distro_hostname(char **hn) {
 
-#if defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+#if defined(TARGET_PLD) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
         int r;
         FILE *f;
 
diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index 7f692e9..0a45854 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -74,7 +74,7 @@ int locale_setup(void) {
 
         if (detect_container(NULL) <= 0)
                 if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
-#if defined(TARGET_FEDORA)
+#if defined(TARGET_FEDORA) || defined(TARGET_PLD)
                                         "LANG",                     &variables[VARIABLE_LANG],
 #endif
                                         "locale.LANG",              &variables[VARIABLE_LANG],
@@ -121,7 +121,7 @@ int locale_setup(void) {
                         log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
         }
 
-#if defined(TARGET_ALTLINUX)
+#if defined(TARGET_PLD) || defined(TARGET_ALTLINUX)
         if (r <= 0 &&
             (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
                                 "LANG", &variables[VARIABLE_LANG],
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 298cb4e..cec3974 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3460,7 +3460,7 @@ finish:
 static int enable_sysv_units(char **args) {
         int r = 0;
 
-#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
+#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
         const char *verb = args[0];
         unsigned f = 1, t = 1;
         LookupPaths paths;
--- systemd-196/src/timedate/timedated.c~	2012-10-16 23:35:40.589269718 +0200
+++ systemd-196/src/timedate/timedated.c	2012-12-21 11:46:13.545086335 +0100
@@ -175,6 +175,15 @@
                 }
         }
 
+#ifdef TARGET_PLD
+	r = parse_env_file("/etc/sysconfig/timezone", NEWLINE,
+			   "TIMEZONE", &tz.zone,
+			   NULL);
+	if (r < 0) {
+		if (r != -ENOENT)
+			log_warning("Failed to read /etc/sysconfig/timezone: %s", strerror(-r));
+	}
+#endif
 #ifdef HAVE_DEBIAN
         r = read_one_line_file("/etc/timezone", &tz.zone);
         if (r < 0) {
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 9196789..1d1a916 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -358,6 +358,16 @@
                         free(vc_keymap);
                         vc_keymap = t;
                 }
+
+#elif defined(TARGET_PLD)
+                r = parse_env_file("/etc/sysconfig/console", NEWLINE,
+                                   "CONSOLEFONT", &vc_font,
+                                   "CONSOLEMAP", &vc_font_map,
+                                   "CONSOLESCREENFONTMAP", &vc_font_unimap,
+                                   "KEYTABLE", &vc_keymap,
+                                   NULL);
+                if (r < 0 && r != -ENOENT)
+                        log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r));
 #endif
         }
 
diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
index 02adc84..a9f31fd 100644
--- a/units/console-shell.service.m4.in
+++ b/units/console-shell.service.m4.in
@@ -11,6 +11,9 @@ After=systemd-user-sessions.service plymouth-quit-wait.service
 m4_ifdef(`TARGET_FEDORA',
 After=rc-local.service
 )m4_dnl
+m4_ifdef(`TARGET_PLD',
+After=rc-local.service
+)m4_dnl
 m4_ifdef(`TARGET_ARCH',
 After=rc-local.service
 )m4_dnl
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index d2a145d..cae4ae5 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -12,6 +12,9 @@ After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
 m4_ifdef(`TARGET_FEDORA',
 After=rc-local.service
 )m4_dnl
+m4_ifdef(`TARGET_PLD',
+After=rc-local.service
+)m4_dnl
 m4_ifdef(`TARGET_ARCH',
 After=rc-local.service
 )m4_dnl
diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
index 7dd8a22..5a9c363 100644
--- a/units/rescue.service.m4.in
+++ b/units/rescue.service.m4.in
@@ -22,6 +22,9 @@ ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D t
 m4_ifdef(`TARGET_FEDORA',
 `EnvironmentFile=/etc/sysconfig/init
 ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+m4_ifdef(`TARGET_PLD',
+`EnvironmentFile=/etc/sysconfig/init
+ExecStart=-/bin/bash -c "exec ${SINGLE}"',
 m4_ifdef(`TARGET_MANDRIVA',
 `EnvironmentFile=/etc/sysconfig/init
 ExecStart=-/bin/bash -c "exec ${SINGLE}"',
@@ -31,7 +34,7 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"',
 m4_ifdef(`TARGET_MAGEIA',
 `EnvironmentFile=/etc/sysconfig/init
 ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-`ExecStart=-/sbin/sulogin')))
+`ExecStart=-/sbin/sulogin'))))
 ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
 StandardInput=tty-force
 StandardOutput=inherit
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
index e5f0ca6..69b7fc2 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -12,6 +12,9 @@ After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
 m4_ifdef(`TARGET_FEDORA',
 After=rc-local.service
 )m4_dnl
+m4_ifdef(`TARGET_PLD',
+After=rc-local.service
+)m4_dnl
 m4_ifdef(`TARGET_ARCH',
 After=rc-local.service
 )m4_dnl
diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index ac6424a..a247c25 100644
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/rc-local-generator/rc-local-generator.c
@@ -27,7 +27,7 @@
 #include "util.h"
 #include "mkdir.h"
 
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
 #define SCRIPT_PATH_START "/etc/rc.d/rc.local"
 #elif defined(TARGET_SUSE)
 #define SCRIPT_PATH_START "/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,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=Display Manager
+After=livesys-late.service rc-local.service systemd-user-sessions.service 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
Commit	Line	Data
440d1d13 BZ	1	diff --git a/Makefile.am b/Makefile.am
	2	index 170465a..bce467d 100644
	3	--- a/Makefile.am
	4	+++ b/Makefile.am
	5	@@ -115,6 +115,12 @@ AM_CPPFLAGS += \
4d29e184 BZ	6	-DKBD_SETFONT=\"/usr/bin/setfont\" \
	7	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
	8	else
	9	+if TARGET_PLD
	10	+AM_CPPFLAGS += \
	11	+ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
	12	+ -DKBD_SETFONT=\"/bin/setfont\" \
	13	+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
	14	+else
	15	AM_CPPFLAGS += \
	16	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
	17	-DKBD_SETFONT=\"/bin/setfont\" \
440d1d13	18	@@ -132,6 +138,7 @@ endif
4d29e184 BZ	19	endif
	20	endif
	21	endif
	22	+endif
	23
	24	rootbin_PROGRAMS = \
	25	systemd \
440d1d13 BZ	26	@@ -381,6 +388,14 @@
	27	systemd-rc-local-generator
	28	endif
	29
	30	+if TARGET_PLD
	31	+dist_systemunit_DATA += \
71b99f19 JR	32	+ units/pld/prefdm.service \
71b99f19 JR	33	+ units/pld/halt-local.service
440d1d13 BZ	34	+systemgenerator_PROGRAMS += \
	35	+ systemd-rc-local-generator
	36	+endif
	37	+
	38	if TARGET_MANDRIVA
	39	dist_systemunit_DATA += \
	40	units/mandriva/prefdm.service \
	41	@@ -1992,6 +1999,23 @@ if TARGET_FEDORA
	42	$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
	43	endif
	44
	45	+if TARGET_PLD
	46	+ $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
	47	+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
	48	+ rm -f rc-local.service && \
4d29e184 BZ	49	+ $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
	50	+ ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
	51	+ rm -f halt-local.service && \
	52	+ $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
	53	+ ( cd $(DESTDIR)$(systemunitdir) && \
	54	+ rm -f display-manager.service single.service && \
	55	+ $(LN_S) prefdm.service display-manager.service && \
	56	+ $(LN_S) rescue.service single.service )
	57	+ ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
	58	+ rm -f display-manager.service && \
	59	+ $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
	60	+endif
	61	+
440d1d13 BZ	62	if TARGET_MANDRIVA
440d1d13 BZ	63	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
4d29e184	64	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
440d1d13 BZ	65	diff --git a/configure.ac b/configure.ac
	66	index 596a32a..f701bfd 100644
	67	--- a/configure.ac
	68	+++ b/configure.ac
440d1d13 BZ	69	@@ -448,6 +449,12 @@ case $with_distro in
	70	M4_DEFINES=-DTARGET_MANDRIVA=1
	71	have_plymouth=yes
	72	;;
	73	+ pld)
	74	+ SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
	75	+ SYSTEM_SYSVRCND_PATH=/etc/rc.d
	76	+ AC_DEFINE(TARGET_PLD, [], [Target is PLD Linux])
	77	+ M4_DISTRO_FLAG=-DTARGET_PLD=1
	78	+ ;;
ab590cee JR	79	angstrom)
	80	SYSTEM_SYSVRCND_PATH=/etc
	81	AC_DEFINE(TARGET_ANGSTROM, [], [Target is Ångström])
440d1d13 BZ	82	@@ -510,6 +517,7 @@ if test -n "$enable_plymouth"; then
	83	fi
	84
	85	AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
	86	+AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
	87	AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
	88	AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
	89	AM_CONDITIONAL(TARGET_UBUNTU, test x"$with_distro" = xubuntu)
082609ad	90	diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
440d1d13	91	index 3477ba1..d32718d 100644
082609ad JR	92	--- a/src/fsck/fsck.c
082609ad JR	93	+++ b/src/fsck/fsck.c
440d1d13	94	@@ -127,7 +127,7 @@ static int parse_proc_cmdline(void) {
4d29e184	95	arg_skip = true;
4400c575 JR	96	else if (startswith(w, "fsck"))
4400c575 JR	97	log_warning("Invalid fsck parameter. Ignoring.");
440d1d13 BZ	98	-#if defined(TARGET_FEDORA) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA)
440d1d13 BZ	99	+#if defined(TARGET_FEDORA) \|\| defined(TARGET_PLD) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA)
4d29e184 BZ	100	else if (strneq(w, "fastboot", l))
	101	arg_skip = true;
	102	else if (strneq(w, "forcefsck", l))
082609ad	103	diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
440d1d13	104	index 2c2f10c..754f0c7 100644
082609ad JR	105	--- a/src/core/hostname-setup.c
082609ad JR	106	+++ b/src/core/hostname-setup.c
4d29e184 BZ	107	@@ -30,7 +30,7 @@
	108	#include "util.h"
	109	#include "log.h"
	110
618c1d39 JR	111	-#if defined(TARGET_ALTLINUX) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA)
618c1d39 JR	112	+#if defined(TARGET_PLD) \|\| defined(TARGET_ALTLINUX) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA)
4d29e184 BZ	113	#define FILENAME "/etc/sysconfig/network"
	114	#elif defined(TARGET_SUSE) \|\| defined(TARGET_SLACKWARE)
	115	#define FILENAME "/etc/HOSTNAME"
440d1d13	116	@@ -64,7 +64,7 @@ static int read_and_strip_hostname(const char path, char *hn) {
4d29e184 BZ	117
	118	static int read_distro_hostname(char **hn) {
	119
618c1d39 JR	120	-#if defined(TARGET_GENTOO) \|\| defined(TARGET_ALTLINUX) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA)
618c1d39 JR	121	+#if defined(TARGET_PLD) \|\| defined(TARGET_GENTOO) \|\| defined(TARGET_ALTLINUX) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA)
4d29e184 BZ	122	int r;
	123	FILE *f;
	124
082609ad	125	diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
440d1d13	126	index 7f692e9..0a45854 100644
082609ad JR	127	--- a/src/core/locale-setup.c
082609ad JR	128	+++ b/src/core/locale-setup.c
440d1d13	129	@@ -74,7 +74,7 @@ int locale_setup(void) {
4d29e184 BZ	130
	131	if (detect_container(NULL) <= 0)
	132	if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
ab590cee JR	133	-#if defined(TARGET_FEDORA)
ab590cee JR	134	+#if defined(TARGET_FEDORA) \|\| defined(TARGET_PLD)
4d29e184 BZ	135	"LANG", &variables[VARIABLE_LANG],
	136	#endif
	137	"locale.LANG", &variables[VARIABLE_LANG],
440d1d13	138	@@ -121,7 +121,7 @@ int locale_setup(void) {
4d29e184 BZ	139	log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
	140	}
	141
618c1d39 JR	142	-#if defined(TARGET_ALTLINUX)
618c1d39 JR	143	+#if defined(TARGET_PLD) \|\| defined(TARGET_ALTLINUX)
4d29e184 BZ	144	if (r <= 0 &&
	145	(r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
	146	"LANG", &variables[VARIABLE_LANG],
082609ad	147	diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
440d1d13	148	index 298cb4e..cec3974 100644
082609ad JR	149	--- a/src/systemctl/systemctl.c
082609ad JR	150	+++ b/src/systemctl/systemctl.c
440d1d13	151	@@ -3460,7 +3460,7 @@ finish:
4d29e184 BZ	152	static int enable_sysv_units(char **args) {
	153	int r = 0;
	154
ab590cee JR	155	-#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_SUSE) \|\| defined(TARGET_ALTLINUX) \|\| defined(TARGET_MAGEIA))
ab590cee JR	156	+#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) \|\| defined(TARGET_PLD) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_SUSE) \|\| defined(TARGET_ALTLINUX) \|\| defined(TARGET_MAGEIA))
4d29e184 BZ	157	const char *verb = args[0];
	158	unsigned f = 1, t = 1;
	159	LookupPaths paths;
a2211e27 JR	160	--- systemd-196/src/timedate/timedated.c~ 2012-10-16 23:35:40.589269718 +0200
	161	+++ systemd-196/src/timedate/timedated.c 2012-12-21 11:46:13.545086335 +0100
	162	@@ -175,6 +175,15 @@
	163	}
	164	}
	165
	166	+#ifdef TARGET_PLD
	167	+ r = parse_env_file("/etc/sysconfig/timezone", NEWLINE,
	168	+ "TIMEZONE", &tz.zone,
	169	+ NULL);
	170	+ if (r < 0) {
	171	+ if (r != -ENOENT)
	172	+ log_warning("Failed to read /etc/sysconfig/timezone: %s", strerror(-r));
	173	+ }
	174	+#endif
	175	#ifdef HAVE_DEBIAN
	176	r = read_one_line_file("/etc/timezone", &tz.zone);
	177	if (r < 0) {
440d1d13 BZ	178	diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
	179	index 9196789..1d1a916 100644
	180	--- a/src/vconsole/vconsole-setup.c
	181	+++ b/src/vconsole/vconsole-setup.c
618c1d39 JR	182	@@ -358,6 +358,16 @@
	183	free(vc_keymap);
	184	vc_keymap = t;
	185	}
	186	+
	187	+#elif defined(TARGET_PLD)
	188	+ r = parse_env_file("/etc/sysconfig/console", NEWLINE,
	189	+ "CONSOLEFONT", &vc_font,
	190	+ "CONSOLEMAP", &vc_font_map,
	191	+ "CONSOLESCREENFONTMAP", &vc_font_unimap,
	192	+ "KEYTABLE", &vc_keymap,
	193	+ NULL);
	194	+ if (r < 0 && r != -ENOENT)
	195	+ log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r));
	196	#endif
4d29e184 BZ	197	}
4d29e184 BZ	198
082609ad	199	diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
440d1d13	200	index 02adc84..a9f31fd 100644
082609ad JR	201	--- a/units/console-shell.service.m4.in
082609ad JR	202	+++ b/units/console-shell.service.m4.in
440d1d13	203	@@ -11,6 +11,9 @@ After=systemd-user-sessions.service plymouth-quit-wait.service
4d29e184 BZ	204	m4_ifdef(`TARGET_FEDORA',
	205	After=rc-local.service
	206	)m4_dnl
	207	+m4_ifdef(`TARGET_PLD',
	208	+After=rc-local.service
	209	+)m4_dnl
	210	m4_ifdef(`TARGET_ARCH',
	211	After=rc-local.service
	212	)m4_dnl
440d1d13 BZ	213	diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
	214	index d2a145d..cae4ae5 100644
	215	--- a/units/getty@.service.m4
	216	+++ b/units/getty@.service.m4
	217	@@ -12,6 +12,9 @@ After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
4d29e184 BZ	218	m4_ifdef(`TARGET_FEDORA',
	219	After=rc-local.service
	220	)m4_dnl
	221	+m4_ifdef(`TARGET_PLD',
	222	+After=rc-local.service
	223	+)m4_dnl
	224	m4_ifdef(`TARGET_ARCH',
	225	After=rc-local.service
	226	)m4_dnl
082609ad	227	diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
440d1d13	228	index 7dd8a22..5a9c363 100644
082609ad JR	229	--- a/units/rescue.service.m4.in
082609ad JR	230	+++ b/units/rescue.service.m4.in
440d1d13 BZ	231	@@ -22,6 +22,9 @@ ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D t
440d1d13 BZ	232	m4_ifdef(`TARGET_FEDORA',
4d29e184 BZ	233	`EnvironmentFile=/etc/sysconfig/init
	234	ExecStart=-/bin/bash -c "exec ${SINGLE}"',
	235	+m4_ifdef(`TARGET_PLD',
	236	+`EnvironmentFile=/etc/sysconfig/init
	237	+ExecStart=-/bin/bash -c "exec ${SINGLE}"',
440d1d13 BZ	238	m4_ifdef(`TARGET_MANDRIVA',
	239	`EnvironmentFile=/etc/sysconfig/init
	240	ExecStart=-/bin/bash -c "exec ${SINGLE}"',
	241	@@ -31,7 +34,7 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"',
ab590cee	242	m4_ifdef(`TARGET_MAGEIA',
4d29e184 BZ	243	`EnvironmentFile=/etc/sysconfig/init
4d29e184 BZ	244	ExecStart=-/bin/bash -c "exec ${SINGLE}"',
ab590cee JR	245	-`ExecStart=-/sbin/sulogin')))
ab590cee JR	246	+`ExecStart=-/sbin/sulogin'))))
082609ad	247	ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
4d29e184 BZ	248	StandardInput=tty-force
4d29e184 BZ	249	StandardOutput=inherit
440d1d13 BZ	250	diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
	251	index e5f0ca6..69b7fc2 100644
	252	--- a/units/serial-getty@.service.m4
	253	+++ b/units/serial-getty@.service.m4
	254	@@ -12,6 +12,9 @@ After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
4d29e184 BZ	255	m4_ifdef(`TARGET_FEDORA',
	256	After=rc-local.service
	257	)m4_dnl
	258	+m4_ifdef(`TARGET_PLD',
	259	+After=rc-local.service
	260	+)m4_dnl
	261	m4_ifdef(`TARGET_ARCH',
	262	After=rc-local.service
	263	)m4_dnl
082609ad	264	diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
440d1d13	265	index ac6424a..a247c25 100644
082609ad JR	266	--- a/src/rc-local-generator/rc-local-generator.c
082609ad JR	267	+++ b/src/rc-local-generator/rc-local-generator.c
440d1d13	268	@@ -27,7 +27,7 @@
440d1d13	269	#include "util.h"
082609ad	270	#include "mkdir.h"
440d1d13 BZ	271
	272	-#if defined(TARGET_FEDORA) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA)
	273	+#if defined(TARGET_FEDORA) \|\| defined(TARGET_PLD) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA)
082609ad	274	#define SCRIPT_PATH_START "/etc/rc.d/rc.local"
440d1d13	275	#elif defined(TARGET_SUSE)
082609ad	276	#define SCRIPT_PATH_START "/etc/init.d/boot.local"
71b99f19 JR	277	--- /dev/null
	278	+++ b/units/pld/halt-local.service
	279	@@ -0,0 +1,20 @@
	280	+# This file is part of systemd.
	281	+#
	282	+# systemd is free software; you can redistribute it and/or modify it
	283	+# under the terms of the GNU General Public License as published by
	284	+# the Free Software Foundation; either version 2 of the License, or
	285	+# (at your option) any later version.
	286	+
	287	+[Unit]
	288	+Description=/sbin/halt.local Compatibility
	289	+ConditionFileIsExecutable=/sbin/halt.local
	290	+DefaultDependencies=no
	291	+After=shutdown.target
	292	+Before=final.target
	293	+
	294	+[Service]
	295	+Type=oneshot
	296	+ExecStart=/sbin/halt.local
	297	+TimeoutSec=0
	298	+StandardOutput=tty
	299	+RemainAfterExit=yes
	300	--- /dev/null
	301	+++ b/units/pld/prefdm.service
6e59c49e	302	@@ -0,0 +1,20 @@
71b99f19 JR	303	+# This file is part of systemd.
	304	+#
	305	+# systemd is free software; you can redistribute it and/or modify it
	306	+# under the terms of the GNU General Public License as published by
	307	+# the Free Software Foundation; either version 2 of the License, or
	308	+# (at your option) any later version.
	309	+
	310	+[Unit]
	311	+Description=Display Manager
e7f63db0	312	+After=livesys-late.service rc-local.service systemd-user-sessions.service acpid.service
71b99f19 JR	313	+
	314	+# Do not stop plymouth, it is done in prefdm if required
	315	+Conflicts=plymouth-quit.service
	316	+After=plymouth-quit.service
	317	+
	318	+[Service]
	319	+ExecStart=/etc/X11/xinit/prefdm -nodaemon
	320	+Restart=always
	321	+RestartSec=0
	322	+IgnoreSIGPIPE=no