pool/ignition
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ignition-rmcfg to /usr/sbin

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=96
This commit is contained in:
Ignaz Forster 2022-06-10 22:25:46 +00:00 committed by Git OBS Bridge
parent 8bba5e9cf6
commit a54e27fc9c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ignition-rmcfg-suse.conf
View File

@ -5,5 +5,5 @@ ConditionKernelCommandLine=|ignition.firstboot
[Service] [Service]
ExecStart= ExecStart=
ExecStart=/bin/bash -c 'if [ "${PLATFORM_ID}" = virtualbox -o "${PLATFORM_ID}" = vmware ]; then /usr/libexec/ignition-rmcfg --platform=${PLATFORM_ID}; fi' ExecStart=/bin/bash -c 'if [ "${PLATFORM_ID}" = virtualbox -o "${PLATFORM_ID}" = vmware ]; then /usr/sbin/ignition-rmcfg --platform=${PLATFORM_ID}; fi'

8
ignition.spec
View File

@ -110,11 +110,13 @@ env VERSION=%{version} GLDFLAGS='-X github.com/coreos/ignition/v2/internal/distr
make -o all install DESTDIR=%{buildroot} make -o all install DESTDIR=%{buildroot}
install -d %{buildroot}%{_sysconfdir}/grub.d install -d %{buildroot}%{_sysconfdir}/grub.d
install -d %{buildroot}%{_prefix}/lib/systemd/system install -d %{buildroot}%{_unitdir}/ignition-delete-config.service.d
install -d %{buildroot}%{_prefix}/lib/systemd/system/ignition-delete-config.service.d
install -p -m 0755 grub/* %{buildroot}%{_sysconfdir}/grub.d/ install -p -m 0755 grub/* %{buildroot}%{_sysconfdir}/grub.d/
install -p -m 0644 systemd_suse/*.service %{buildroot}%{_prefix}/lib/systemd/system/ install -p -m 0644 systemd_suse/*.service %{buildroot}%{_prefix}/lib/systemd/system/
install -p -m 0644 systemd_suse/ignition-delete-config.service.d/* %{buildroot}%{_prefix}/lib/systemd/system/ignition-delete-config.service.d install -p -m 0644 systemd_suse/ignition-delete-config.service.d/* %{buildroot}%{_prefix}/lib/systemd/system/ignition-delete-config.service.d
install -d %{buildroot}%{_sbindir}/
mv %{buildroot}/usr/libexec/ignition-rmcfg %{buildroot}/%{_sbindir}/
rmdir %{buildroot}/usr/libexec
%pre %pre
%service_add_pre ignition-delete-config.service %service_add_pre ignition-delete-config.service
@ -170,8 +172,8 @@ fi
/usr/lib/dracut/modules.d/30ignition /usr/lib/dracut/modules.d/30ignition
/usr/lib/dracut/modules.d/30ignition-microos /usr/lib/dracut/modules.d/30ignition-microos
/usr/bin/ignition-validate /usr/bin/ignition-validate
/usr/libexec/ignition-rmcfg
/usr/lib/systemd/system/ignition-delete-config.service /usr/lib/systemd/system/ignition-delete-config.service
%{_sbindir}/ignition-rmcfg
%dir %{_unitdir}/ignition-delete-config.service.d %dir %{_unitdir}/ignition-delete-config.service.d
%{_unitdir}/ignition-delete-config.service.d/ignition-rmcfg-suse.conf %{_unitdir}/ignition-delete-config.service.d/ignition-rmcfg-suse.conf