Annotation of /trunk/systemd/patches/systemd-38-magellan-configurable-getty.patch
Parent Directory | Revision Log
Revision 1623 -
(hide annotations)
(download)
Thu Jan 19 23:05:53 2012 UTC (12 years, 8 months ago) by niro
File size: 2312 byte(s)
Thu Jan 19 23:05:53 2012 UTC (12 years, 8 months ago) by niro
File size: 2312 byte(s)
-re-diffed against systemd-38
1 | niro | 1623 | diff -Naur systemd-38/Makefile.am systemd-38-magellan/Makefile.am |
2 | --- systemd-38/Makefile.am 2012-01-11 04:01:36.734404653 +0100 | ||
3 | +++ systemd-38-magellan/Makefile.am 2012-01-20 00:46:35.282982932 +0100 | ||
4 | @@ -2420,6 +2420,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 HAVE_SYSV_COMPAT | ||
14 | ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ | ||
15 | rm -f var-lock.mount && \ | ||
16 | diff -Naur systemd-38/Makefile.in systemd-38-magellan/Makefile.in | ||
17 | --- systemd-38/Makefile.in 2012-01-11 04:01:55.885431817 +0100 | ||
18 | +++ systemd-38-magellan/Makefile.in 2012-01-20 00:48:09.276982933 +0100 | ||
19 | @@ -8477,6 +8477,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 | @HAVE_SYSV_COMPAT_TRUE@ ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ | ||
27 | @HAVE_SYSV_COMPAT_TRUE@ rm -f var-lock.mount && \ | ||
28 | @HAVE_SYSV_COMPAT_TRUE@ $(LN_S) ../var-lock.mount var-lock.mount ) | ||
29 | diff -Naur systemd-38/src/getty.confd systemd-38-magellan/src/getty.confd | ||
30 | --- systemd-38/src/getty.confd 1970-01-01 01:00:00.000000000 +0100 | ||
31 | +++ systemd-38-magellan/src/getty.confd 2012-01-20 00:49:14.780982933 +0100 | ||
32 | @@ -0,0 +1,7 @@ | ||
33 | +# Getty configuration file | ||
34 | + | ||
35 | +# Default getty speed | ||
36 | +GETTY_SPEED="38400" | ||
37 | + | ||
38 | +# Getty options like --autologin etc | ||
39 | +GETTY_OPTS="" | ||
40 | diff -Naur systemd-38/units/getty@.service.m4 systemd-38-magellan/units/getty@.service.m4 | ||
41 | --- systemd-38/units/getty@.service.m4 2011-12-30 22:27:36.556529032 +0100 | ||
42 | +++ systemd-38-magellan/units/getty@.service.m4 2012-01-20 00:52:57.891982933 +0100 | ||
43 | @@ -34,8 +34,16 @@ | ||
44 | Before=getty.target | ||
45 | |||
46 | [Service] | ||
47 | +m4_ifdef(`TARGET_MAGELLAN', | ||
48 | +EnvironmentFile=-/etc/conf.d/getty | ||
49 | +)m4_dnl | ||
50 | Environment=TERM=linux | ||
51 | -ExecStart=-/sbin/agetty %I 38400 | ||
52 | +m4_ifdef(`TARGET_MAGELLAN', | ||
53 | +``ExecStart=-/sbin/agetty %I $GETTY_SPEED $GETTY_OPTS | ||
54 | +'', | ||
55 | +``ExecStart=-/sbin/agetty %I 38400'' | ||
56 | +)m4_dnl | ||
57 | + | ||
58 | Restart=always | ||
59 | RestartSec=0 | ||
60 | UtmpIdentifier=%I |