Contents of /trunk/systemd/patches/systemd-33-magellan-configurable-getty-5.patch
Parent Directory | Revision Log
Revision 1566 -
(show annotations)
(download)
Thu Nov 24 12:45:46 2011 UTC (12 years, 10 months ago) by niro
File size: 2492 byte(s)
Thu Nov 24 12:45:46 2011 UTC (12 years, 10 months ago) by niro
File size: 2492 byte(s)
-fixed a typo
1 | diff -Naur systemd-34/Makefile.am systemd-34-magellan/Makefile.am |
2 | --- systemd-34/Makefile.am 2011-08-25 17:02:19.000000000 +0200 |
3 | +++ systemd-34-magellan/Makefile.am 2011-08-27 01:10:56.000000000 +0200 |
4 | @@ -1734,6 +1734,7 @@ |
5 | $(DESTDIR)$(systemshutdowndir) \ |
6 | $(DESTDIR)$(systemgeneratordir) \ |
7 | $(DESTDIR)$(usergeneratordir) |
8 | + |
9 | if ENABLE_BINFMT |
10 | $(MKDIR_P) -m 0755 \ |
11 | $(DESTDIR)$(prefix)/lib/binfmt.d \ |
12 | @@ -1986,6 +1987,11 @@ |
13 | $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) |
14 | endif |
15 | |
16 | +if TARGET_MAGELLAN |
17 | + $(MKDIR_P) -m 0755 $(DESTDIR)$(sysconfdir)/conf.d |
18 | + $(INSTALL_DATA) src/getty.confd $(DESTDIR)$(sysconfdir)/conf.d/getty |
19 | +endif |
20 | + |
21 | if HAVE_SYSV_COMPAT |
22 | ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ |
23 | rm -f var-lock.mount && \ |
24 | diff -Naur systemd-34/Makefile.in systemd-34-magellan/Makefile.in |
25 | --- systemd-34/Makefile.in 2011-08-25 17:02:52.000000000 +0200 |
26 | +++ systemd-34-magellan/Makefile.in 2011-08-27 01:10:56.000000000 +0200 |
27 | @@ -7835,6 +7835,9 @@ |
28 | @TARGET_SUSE_TRUE@ rm -f halt-local.service && \ |
29 | @TARGET_SUSE_TRUE@ $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) |
30 | |
31 | +@TARGET_MAGELLAN_TRUE@ $(MKDIR_P) -m 0755 $(DESTDIR)$(sysconfdir)/conf.d |
32 | +@TARGET_MAGELLAN_TRUE@ $(INSTALL_DATA) src/getty.confd $(DESTDIR)$(sysconfdir)/conf.d/getty |
33 | + |
34 | @HAVE_SYSV_COMPAT_TRUE@ ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ |
35 | @HAVE_SYSV_COMPAT_TRUE@ rm -f var-lock.mount && \ |
36 | @HAVE_SYSV_COMPAT_TRUE@ $(LN_S) ../var-lock.mount var-lock.mount ) |
37 | diff -Naur systemd-34/src/getty.confd systemd-34-magellan/src/getty.confd |
38 | --- systemd-34/src/getty.confd 1970-01-01 01:00:00.000000000 +0100 |
39 | +++ systemd-34-magellan/src/getty.confd 2011-08-27 01:10:56.000000000 +0200 |
40 | @@ -0,0 +1,7 @@ |
41 | +# Getty configuration file |
42 | + |
43 | +# Default getty speed |
44 | +GETTY_SPEED="38400" |
45 | + |
46 | +# Getty options like --autologin etc |
47 | +GETTY_OPTS="" |
48 | diff -Naur systemd-34/units/getty@.service.m4 systemd-34-magellan/units/getty@.service.m4 |
49 | --- systemd-34/units/getty@.service.m4 2011-06-28 12:32:19.000000000 +0200 |
50 | +++ systemd-34-magellan/units/getty@.service.m4 2011-08-27 01:11:28.000000000 +0200 |
51 | @@ -31,8 +31,16 @@ |
52 | Before=getty.target |
53 | |
54 | [Service] |
55 | +m4_ifdef(`TARGET_MAGELLAN', |
56 | +EnvironmentFile=-/etc/conf.d/getty |
57 | +)m4_dnl |
58 | Environment=TERM=linux |
59 | -ExecStart=-/sbin/agetty %I 38400 |
60 | +m4_ifdef(`TARGET_MAGELLAN', |
61 | +``ExecStart=-/sbin/agetty %I $GETTY_SPEED $GETTY_OPTS |
62 | +'', |
63 | +``ExecStart=-/sbin/agetty %I 38400'' |
64 | +)m4_dnl |
65 | + |
66 | Restart=always |
67 | RestartSec=0 |
68 | UtmpIdentifier=%I |