Magellan Linux

Annotation of /trunk/systemd/patches/systemd-188-magellan-configurable-getty.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1876 - (hide annotations) (download)
Wed Aug 15 12:54:38 2012 UTC (11 years, 10 months ago) by niro
File size: 2218 byte(s)
-re-diffed patches
1 niro 1876 diff -Naur systemd-188/Makefile.am systemd-188-magellan/Makefile.am
2     --- systemd-188/Makefile.am 2012-08-15 16:47:20.199981494 +0200
3     +++ systemd-188-magellan/Makefile.am 2012-08-15 16:48:42.425979163 +0200
4     @@ -3602,6 +3602,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-188/Makefile.in systemd-188-magellan/Makefile.in
17     --- systemd-188/Makefile.in 2012-08-08 21:50:35.079747869 +0200
18     +++ systemd-188-magellan/Makefile.in 2012-08-15 16:49:40.372981142 +0200
19     @@ -9690,6 +9690,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_EXEC_HOOKS)
29     diff -Naur systemd-188/src/getty.confd systemd-188-magellan/src/getty.confd
30     --- systemd-188/src/getty.confd 1970-01-01 01:00:00.000000000 +0100
31     +++ systemd-188-magellan/src/getty.confd 2012-08-15 16:50:28.906980338 +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-188/units/getty@.service.m4 systemd-188-magellan/units/getty@.service.m4
42     --- systemd-188/units/getty@.service.m4 2012-06-19 17:29:22.584187352 +0200
43     +++ systemd-188-magellan/units/getty@.service.m4 2012-08-15 16:52:10.404979328 +0200
44     @@ -40,9 +40,17 @@
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     # the VT is cleared by TTYVTDisallocate
53     -ExecStart=-/sbin/agetty --noclear %I 38400
54     +m4_ifdef(`TARGET_MAGELLAN',
55     +``ExecStart=-/sbin/agetty --noclear %I $GETTY_SPEED $GETTY_OPTS
56     +'',
57     +``ExecStart=-/sbin/agetty --noclear %I 38400''
58     +)m4_dnl
59     +
60     Type=idle
61     Restart=always
62     RestartSec=0