diff --git a/sysmaster.spec b/sysmaster.spec index 80ad844..15945e7 100644 --- a/sysmaster.spec +++ b/sysmaster.spec @@ -16,7 +16,7 @@ Name: sysmaster Version: 0.5.1 -Release: 5 +Release: 6 Summary: redesign and reimplement process1. License: Mulan PSL v2 @@ -154,11 +154,11 @@ done for unit in devmaster.service devctl-trigger.service; do install -Dm0640 -t %{unit_install_target} tools/run_with_devmaster/service/$unit - if [[ "$unit" == *".service" ]]; then - ln -s /usr/lib/sysmaster/system/$unit %{buildroot}/etc/sysmaster/system/sysinit.target.wants/$unit - fi done +ln -s /usr/lib/sysmaster/system/devmaster.service %{buildroot}/etc/sysmaster/system/sysinit.target.wants/devmaster.service +ln -s /usr/lib/sysmaster/system/devctl-trigger.service %{buildroot}/etc/sysmaster/system/multi-user.target.wants/devctl-trigger.service + install -Dm0640 -t %{unit_install_target} tools/run_with_devmaster/service/*.service install -Dm0640 -t %{unit_install_target} tools/run_with_vm/getty.target ln -s /usr/lib/sysmaster/system//getty.target %{buildroot}/etc/sysmaster/system/multi-user.target.wants/getty.target @@ -200,7 +200,7 @@ ln -s /usr/lib/sysmaster/system/sshd.service %{buildroot}/etc/sysmaster/system/m %exclude /usr/lib/sysmaster/system/devmaster-simu-udev.service %exclude /usr/lib/sysmaster/system/devmaster.service %exclude /etc/sysmaster/system/sysinit.target.wants/devmaster.service -%exclude /etc/sysmaster/system/sysinit.target.wants/devctl-trigger.service +%exclude /etc/sysmaster/system/multi-user.target.wants/devctl-trigger.service %files -n devmaster %dir %attr(0550,-,-) /usr/lib/devmaster @@ -217,7 +217,7 @@ ln -s /usr/lib/sysmaster/system/sshd.service %{buildroot}/etc/sysmaster/system/m /usr/lib/sysmaster/system/devmaster.service /usr/lib/devmaster/simulate_udev.sh /etc/sysmaster/system/sysinit.target.wants/devmaster.service -/etc/sysmaster/system/sysinit.target.wants/devctl-trigger.service +/etc/sysmaster/system/multi-user.target.wants/devctl-trigger.service %post -n devmaster test -f /etc/sysmaster/system/sysinit.target.wants/udevd.service && unlink /etc/sysmaster/system/sysinit.target.wants/udevd.service || : @@ -228,6 +228,9 @@ test -f /usr/lib/sysmaster/system/udevd.service && ln -s /usr/lib/sysmaster/syst test -f /usr/lib/sysmaster/system/udev-trigger.service && ln -s /usr/lib/sysmaster/system/udev-trigger.service /etc/sysmaster/system/sysinit.target.wants/udev-trigger.service || : %changelog +* Mon Dec 11 2023 chenjiayi - 0.5.1-6 +- fix incorrect symbolic linkage location of devctl-trigger.service + * Thu Dec 7 2023 chenjiayi - 0.5.1-5 - complement dependency from devmaster to sysmaster and avoid exit with failure in post and postun process