Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 3008 - (hide annotations) (download)
Tue Oct 24 09:03:13 2017 UTC (6 years, 6 months ago) by niro
File size: 2002 byte(s)
-re-diffed for systemd-235 with meson
1 niro 3008 diff -Naur systemd-235/conf.d/getty systemd-235-magellan/conf.d/getty
2     --- systemd-235/conf.d/getty 1970-01-01 01:00:00.000000000 +0100
3     +++ systemd-235-magellan/conf.d/getty 2017-10-24 10:41:27.893784081 +0200
4     @@ -0,0 +1,11 @@
5     +# Getty configuration file
6     +
7     +# Default getty speed
8     +GETTY_SPEED="38400"
9     +
10     +# Getty options like --autologin etc
11     +GETTY_OPTS=""
12     +
13     +# Getty default terminal emulation mode
14     +GETTY_TERM="linux"
15     +
16     diff -Naur systemd-235/meson.build systemd-235-magellan/meson.build
17     --- systemd-235/meson.build 2017-10-06 10:18:04.000000000 +0200
18     +++ systemd-235-magellan/meson.build 2017-10-24 11:02:49.039015518 +0200
19     @@ -119,6 +119,7 @@
20     systemdstatedir = join_paths(localstatedir, 'lib/systemd')
21     catalogstatedir = join_paths(systemdstatedir, 'catalog')
22     randomseeddir = join_paths(localstatedir, 'lib/systemd')
23     +gettyconfddir = join_paths(sysconfdir, 'conf.d')
24    
25     dbuspolicydir = get_option('dbuspolicydir')
26     if dbuspolicydir == ''
27     @@ -2353,6 +2354,8 @@
28     install_dir : systempresetdir)
29     install_data('modprobe.d/systemd.conf',
30     install_dir : modprobedir)
31     +install_data('conf.d/getty',
32     + install_dir : gettyconfddir)
33     install_data('README',
34     'NEWS',
35     'CODING_STYLE',
36     diff -Naur systemd-235/units/getty@.service.m4 systemd-235-magellan/units/getty@.service.m4
37     --- systemd-235/units/getty@.service.m4 2017-10-06 10:18:04.000000000 +0200
38     +++ systemd-235-magellan/units/getty@.service.m4 2017-10-24 10:48:15.523969557 +0200
39     @@ -32,11 +32,12 @@
40     ConditionPathExists=/dev/tty0
41    
42     [Service]
43     +EnvironmentFile=-/etc/conf.d/getty
44     # the VT is cleared by TTYVTDisallocate
45     # The '-o' option value tells agetty to replace 'login' arguments with an
46     # option to preserve environment (-p), followed by '--' for safety, and then
47     # the entered username.
48     -ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM
49     +ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $GETTY_SPEED $GETTY_TERM $GETTY_OPTS
50     Type=idle
51     Restart=always
52     RestartSec=0