Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1495 - (hide annotations) (download)
Sun Aug 14 15:45:58 2011 UTC (12 years, 9 months ago) by niro
File size: 2452 byte(s)
-fixed getty patch
1 niro 1495 diff -Naur systemd-33/Makefile.am systemd-33-magellan/Makefile.am
2     --- systemd-33/Makefile.am 2011-08-14 19:19:01.000000000 +0200
3     +++ systemd-33-magellan/Makefile.am 2011-08-14 19:19:09.000000000 +0200
4     @@ -1683,6 +1683,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     @@ -1927,6 +1928,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-33/Makefile.in systemd-33-magellan/Makefile.in
25     --- systemd-33/Makefile.in 2011-08-03 04:20:25.000000000 +0200
26     +++ systemd-33-magellan/Makefile.in 2011-08-14 19:19:09.000000000 +0200
27     @@ -7777,6 +7777,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-33/src/getty.confd systemd-33-magellan/src/getty.confd
38     --- systemd-33/src/getty.confd 1970-01-01 01:00:00.000000000 +0100
39     +++ systemd-33-magellan/src/getty.confd 2011-08-14 19:19:57.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-33/units/getty@.service.m4 systemd-33-magellan/units/getty@.service.m4
49     --- systemd-33/units/getty@.service.m4 2011-06-29 22:24:44.000000000 +0200
50     +++ systemd-33-magellan/units/getty@.service.m4 2011-08-14 19:19:43.000000000 +0200
51     @@ -31,8 +31,15 @@
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     +m4_ifdef(`TARGET_MAGELLAN',
60     +ExecStart=-/sbin/agetty %I ${GETTY_SPEED} ${GETTY_OPTS},
61     ExecStart=-/sbin/agetty %I 38400
62     +)m4_dnl
63     +
64     Restart=always
65     RestartSec=0
66     UtmpIdentifier=%I