Contents of /trunk/systemd/patches/systemd-185-magellan-configurable-getty.patch
Parent Directory | Revision Log
Revision 1811 -
(show annotations)
(download)
Tue Jun 26 13:34:57 2012 UTC (12 years, 3 months ago) by niro
File size: 2233 byte(s)
Tue Jun 26 13:34:57 2012 UTC (12 years, 3 months ago) by niro
File size: 2233 byte(s)
-rediffed patches for systemd-185
1 | diff -Naur systemd-185/Makefile.am systemd-185-magellan/Makefile.am |
2 | --- systemd-185/Makefile.am 2012-06-26 16:23:50.395985466 +0200 |
3 | +++ systemd-185-magellan/Makefile.am 2012-06-26 16:27:03.174982387 +0200 |
4 | @@ -3297,6 +3297,11 @@ |
5 | $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) |
6 | endif |
7 | |
8 | +if TARGET_MAGELLAN |
9 | + $(MKDIR_P) -m 0755 $(DESTDIR)$(sysconfdir)/conf.d |
10 | + $(INSTALL_DATA) src/getty.confd $(DESTDIR)$(sysconfdir)/conf.d/getty |
11 | +endif |
12 | + |
13 | if TARGET_MANDRIVA |
14 | ( cd $(DESTDIR)$(systemunitdir) && \ |
15 | rm -f display-manager.service dm.service single.service && \ |
16 | diff -Naur systemd-185/Makefile.in systemd-185-magellan/Makefile.in |
17 | --- systemd-185/Makefile.in 2012-06-04 20:15:49.649483370 +0200 |
18 | +++ systemd-185-magellan/Makefile.in 2012-06-26 16:29:23.716982189 +0200 |
19 | @@ -10061,6 +10061,9 @@ |
20 | @TARGET_MAGEIA_TRUE@ rm -f display-manager.service && \ |
21 | @TARGET_MAGEIA_TRUE@ $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) |
22 | |
23 | +@TARGET_MAGELLAN_TRUE@ $(MKDIR_P) -m 0755 $(DESTDIR)$(sysconfdir)/conf.d |
24 | +@TARGET_MAGELLAN_TRUE@ $(INSTALL_DATA) src/getty.confd $(DESTDIR)$(sysconfdir)/conf.d/getty |
25 | + |
26 | install-exec-hook: $(INSTALL_EXEC_HOOKS) |
27 | |
28 | uninstall-hook: $(UNINSTALL_EXEC_HOOKS) |
29 | diff -Naur systemd-185/src/getty.confd systemd-185-magellan/src/getty.confd |
30 | --- systemd-185/src/getty.confd 1970-01-01 01:00:00.000000000 +0100 |
31 | +++ systemd-185-magellan/src/getty.confd 2012-06-26 16:30:13.873984562 +0200 |
32 | @@ -0,0 +1,8 @@ |
33 | ++# Getty configuration file |
34 | ++ |
35 | ++# Default getty speed |
36 | ++GETTY_SPEED="38400" |
37 | ++ |
38 | ++# Getty options like --autologin etc |
39 | ++GETTY_OPTS="" |
40 | + |
41 | diff -Naur systemd-185/units/getty@.service.m4 systemd-185-magellan/units/getty@.service.m4 |
42 | --- systemd-185/units/getty@.service.m4 2012-05-21 19:23:02.769293222 +0200 |
43 | +++ systemd-185-magellan/units/getty@.service.m4 2012-06-26 16:31:51.883982107 +0200 |
44 | @@ -40,8 +40,16 @@ |
45 | ConditionPathExists=/dev/tty0 |
46 | |
47 | [Service] |
48 | +m4_ifdef(`TARGET_MAGELLAN', |
49 | +EnvironmentFile=-/etc/conf.d/getty |
50 | +)m4_dnl |
51 | Environment=TERM=linux |
52 | -ExecStart=-/sbin/agetty %I 38400 |
53 | +m4_ifdef(`TARGET_MAGELLAN', |
54 | +``ExecStart=-/sbin/agetty %I $GETTY_SPEED $GETTY_OPTS |
55 | +'', |
56 | +``ExecStart=-/sbin/agetty %I 38400'' |
57 | +)m4_dnl |
58 | + |
59 | Type=idle |
60 | Restart=always |
61 | RestartSec=0 |