Magellan Linux

Contents of /trunk/systemd/patches/systemd-196-magellan-configurable-getty.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1967 - (show annotations) (download)
Thu Nov 22 14:09:18 2012 UTC (11 years, 6 months ago) by niro
File size: 2236 byte(s)
-re-diffed patches for systemd-196
1 diff -Naur systemd-196/Makefile.am systemd-196-magellan/Makefile.am
2 --- systemd-196/Makefile.am 2012-11-22 19:04:53.980639949 +0100
3 +++ systemd-196-magellan/Makefile.am 2012-11-22 19:10:14.844637730 +0100
4 @@ -4099,6 +4099,11 @@
5 $(LN_S) rescue.service single.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-196/Makefile.in systemd-196-magellan/Makefile.in
17 --- systemd-196/Makefile.in 2012-11-21 02:16:17.795133751 +0100
18 +++ systemd-196-magellan/Makefile.in 2012-11-22 19:10:46.265637495 +0100
19 @@ -10918,6 +10918,9 @@
20 @TARGET_MAGEIA_TRUE@ ( cd $(DESTDIR)$(systemunitdir) && \
21 @TARGET_MAGEIA_TRUE@ rm -f 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_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
29 diff -Naur systemd-196/src/getty.confd systemd-196-magellan/src/getty.confd
30 --- systemd-196/src/getty.confd 1970-01-01 01:00:00.000000000 +0100
31 +++ systemd-196-magellan/src/getty.confd 2012-11-22 19:11:07.188637347 +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-196/units/getty@.service.m4 systemd-196-magellan/units/getty@.service.m4
41 --- systemd-196/units/getty@.service.m4 2012-11-20 21:39:16.329058797 +0100
42 +++ systemd-196-magellan/units/getty@.service.m4 2012-11-22 19:12:32.742636742 +0100
43 @@ -44,8 +44,16 @@
44 ConditionPathExists=/dev/tty0
45
46 [Service]
47 +m4_ifdef(`TARGET_MAGELLAN',
48 +EnvironmentFile=-/etc/conf.d/getty
49 +)m4_dnl
50 # the VT is cleared by TTYVTDisallocate
51 -ExecStart=-/sbin/agetty --noclear %I 38400 linux
52 +m4_ifdef(`TARGET_MAGELLAN',
53 +``ExecStart=-/sbin/agetty --noclear %I $GETTY_SPEED linux $GETTY_OPTS
54 +'',
55 +``ExecStart=-/sbin/agetty --noclear %I 38400 linux''
56 +)m4_dnl
57 +
58 Type=idle
59 Restart=always
60 RestartSec=0