diff --git a/sysmaster.spec b/sysmaster.spec index 93df6ec..2237a27 100644 --- a/sysmaster.spec +++ b/sysmaster.spec @@ -16,7 +16,7 @@ Name: sysmaster Version: 0.5.1 -Release: 1 +Release: 2 Summary: redesign and reimplement process1. License: Mulan PSL v2 @@ -78,6 +78,7 @@ install -Dm0640 -t %{unit_install_target} %{unit_install_source}/* install -Dm0640 -t %{buildroot}/etc/sysmaster %{conf_install_source}/system.conf install -Dm0750 -t %{buildroot}/usr/bin %{devmaster_install_source}/devctl +install -Dm0550 -t %{devmaster_install_target} tools/run_with_devmaster/simulate_udev.sh install -Dm0640 -t %{devmaster_conf_install_target} %{devmaster_conf_install_source}/config.toml install -Dm0640 -t %{devmaster_conf_install_target}/rules.d %{devmaster_conf_install_source}/rules.d/* install -Dm0640 -t %{devmaster_conf_install_target}/network.d %{devmaster_conf_install_source}/network.d/* @@ -102,6 +103,13 @@ for unit in udevd.service udev-trigger.service; do fi 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 + 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 @@ -142,6 +150,8 @@ ln -s /usr/lib/sysmaster/system/sshd.service %{buildroot}/etc/sysmaster/system/m %exclude /usr/lib/sysmaster/system/devctl-trigger.service %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 %files -n devmaster %dir %attr(0550,-,-) /usr/lib/devmaster @@ -156,16 +166,22 @@ ln -s /usr/lib/sysmaster/system/sshd.service %{buildroot}/etc/sysmaster/system/m /usr/lib/sysmaster/system/devctl-trigger.service /usr/lib/sysmaster/system/devmaster-simu-udev.service /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 %post -n devmaster -ln -sf /usr/lib/sysmaster/system/devmaster.service /etc/sysmaster/system/sysinit.target.wants/udevd.service -ln -sf /usr/lib/sysmaster/system/devctl-trigger.service /etc/sysmaster/system/multi-user.target.wants/udev-trigger.service +test -f /etc/sysmaster/system/sysinit.target.wants/udevd.service && unlink /etc/sysmaster/system/sysinit.target.wants/udevd.service +test -f /etc/sysmaster/system/sysinit.target.wants/udev-trigger.service && unlink /etc/sysmaster/system/sysinit.target.wants/udev-trigger.service %postun -n devmaster -test -f /usr/lib/sysmaster/system/udevd.service && ln -sf /usr/lib/sysmaster/system/udevd.service /etc/sysmaster/system/sysinit.target.wants/udevd.service -test -f /usr/lib/sysmaster/system/udev-trigger.service && ln -sf /usr/lib/sysmaster/system/udev-trigger.service /etc/sysmaster/system/multi-user.target.wants/udev-trigger.service +test -f /usr/lib/sysmaster/system/udevd.service && ln -s /usr/lib/sysmaster/system/udevd.service /etc/sysmaster/system/sysinit.target.wants/udevd.service +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 Oct 30 2023 zhangyao - 0.5.1-2 +- add simulate_udev.sh file + * Mon Oct 30 2023 zhangyao - 0.5.1-1 - upgrade version to 0.5.1