/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11318-runlevel7.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11318-runlevel7.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Mon Jan 11 08:45:21 2021 UTC (3 years, 9 months ago) by jpp
Branch: MAIN
* Mon Jan 11 2021 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-76.sme
- separate bootstrap-console from run level service launch [SME: 11318]

1 jpp 1.1 diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks
2     --- e-smith-base-5.8.0.old/createlinks 2021-01-11 01:11:47.303000000 -0500
3     +++ e-smith-base-5.8.0/createlinks 2021-01-11 03:42:51.165000000 -0500
4     @@ -623,7 +623,7 @@
5     system('mkdir -p root/usr/lib/systemd/system/'.$target.'.target.wants/');
6     unlink "root/usr/lib/systemd/system/$target.target.wants/bootstrap-console.service";
7    
8     -foreach my $unit (qw(bootstrap-console.service
9     +foreach my $unit (qw(
10     dbus.service
11     getty.target
12     plymouth-quit.service
13     @@ -632,8 +632,6 @@
14     systemd-logind.service
15     systemd-update-utmp-runlevel.service
16     systemd-user-sessions.service
17     - networking.service
18     - mdmonitor.service
19     ))
20     {
21     symlink("../$unit",
22     @@ -641,6 +639,12 @@
23     or die "Can't symlink to root/usr/lib/systemd/system/$target.target.wants/$unit: $!";
24     }
25     }
26     +my $unit="bootstrap-console.service";
27     +my $target="basic";
28     +symlink("../$unit",
29     + "root/usr/lib/systemd/system/$target.target.wants/$unit")
30     + or die "Can't symlink to root/usr/lib/systemd/system/$target.target.wants/$unit: $!";
31     +
32     symlink("mdmonitor.service",
33     "root/usr/lib/systemd/system/raidmonitor.service");
34    
35     diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/sme-server.target.d/50koozali.conf/20services e-smith-base-5.8.0/root/etc/e-smith/templates/usr/lib/systemd/system/sme-server.target.d/50koozali.conf/20services
36     --- e-smith-base-5.8.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/sme-server.target.d/50koozali.conf/20services 2021-01-11 01:11:47.305000000 -0500
37     +++ e-smith-base-5.8.0/root/etc/e-smith/templates/usr/lib/systemd/system/sme-server.target.d/50koozali.conf/20services 2021-01-11 03:38:06.324000000 -0500
38     @@ -10,6 +10,8 @@
39     $status = "disable" if -e "/etc/rc.d/init.d/".$service->key || -e "/etc/rc.d/init.d/supervise/".$service->key;
40     }
41     next unless -e "/usr/lib/systemd/system/$servicename" || -e "/etc/lib/systemd/system/$servicename";
42     + # bootstrap-console is wantedby basic.target
43     + next if ($servicename eq "bootstrap-console.service");
44     # we could also filter out there services that have already WantedBy=.*sme-server.target in their unit file or in a drop-in
45    
46     $OUT .= "$servicename " if ($status eq "enable");
47     diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/bootstrap-console.service e-smith-base-5.8.0/root/usr/lib/systemd/system/bootstrap-console.service
48     --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/bootstrap-console.service 2021-01-11 01:11:47.228000000 -0500
49     +++ e-smith-base-5.8.0/root/usr/lib/systemd/system/bootstrap-console.service 2021-01-11 03:00:50.176000000 -0500
50     @@ -6,6 +6,7 @@
51     After=systemd-vconsole-setup.service
52     Before=getty@tty1.service
53     Before=shutdown.target
54     +Before=network.target network-online.target network-pre.target
55    
56     [Service]
57     Environment=HOME=/root
58     @@ -23,5 +24,4 @@
59     SendSIGHUP=yes
60    
61     [Install]
62     -WantedBy=multi-user.target
63     -WantedBy=sme-server.target
64     +WantedBy=basic.target
65     diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/bootstrap-runlevel7.service e-smith-base-5.8.0/root/usr/lib/systemd/system/bootstrap-runlevel7.service
66     --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/bootstrap-runlevel7.service 1969-12-31 19:00:00.000000000 -0500
67     +++ e-smith-base-5.8.0/root/usr/lib/systemd/system/bootstrap-runlevel7.service 2021-01-11 03:01:23.012000000 -0500
68     @@ -0,0 +1,27 @@
69     +[Unit]
70     +Description=SME server bootstrap-runlevel7 to start old SME rc7.d services
71     +DefaultDependencies=no
72     +Conflicts=shutdown.target
73     +After=livesys.service plymouth-quit-wait.service
74     +After=systemd-vconsole-setup.service
75     +After=basic.target bootstrap-console.service
76     +Before=getty@tty1.service
77     +Before=shutdown.target
78     +
79     +[Service]
80     +Environment=HOME=/root
81     +WorkingDirectory=/root
82     +ExecStartPre=-/bin/plymouth quit
83     +ExecStart=/sbin/e-smith/bootstrap-runlevel7
84     +Type=oneshot
85     +Restart=no
86     +TimeoutSec=0
87     +StandardInput=tty
88     +StandardOutput=tty
89     +StandardError=tty
90     +KillMode=process
91     +IgnoreSIGPIPE=no
92     +SendSIGHUP=yes
93     +
94     +[Install]
95     +WantedBy=sme-server.target

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed