Move overlays to rootfs and and set ownership
Move all overlay contents to a rootfs subdirectory, which was already supported, and set ownership to root:root. Closes #1078 Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
@@ -68,6 +68,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- Fixed a bug where error occurs when editing node. #1024
|
- Fixed a bug where error occurs when editing node. #1024
|
||||||
- Optionally detect network and netmask from CIDR IP address. #1016
|
- Optionally detect network and netmask from CIDR IP address. #1016
|
||||||
- Fix startup of wwclient on systemd hosts #1066
|
- Fix startup of wwclient on systemd hosts #1066
|
||||||
|
- Change ownership of overlays to root:root #1086
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
@@ -164,6 +165,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- Added documentation about of how to configure warewulf with
|
- Added documentation about of how to configure warewulf with
|
||||||
multiple networks
|
multiple networks
|
||||||
- Added installation instructions for using dnsmasq
|
- Added installation instructions for using dnsmasq
|
||||||
|
- Move built-in overlays to a rootfs directory #1086
|
||||||
|
|
||||||
## [4.4.0] 2023-01-18
|
## [4.4.0] 2023-01-18
|
||||||
|
|
||||||
|
|||||||
22
Makefile
22
Makefile
@@ -93,8 +93,8 @@ install: build docs
|
|||||||
install -d -m 0755 $(DESTDIR)$(BINDIR)
|
install -d -m 0755 $(DESTDIR)$(BINDIR)
|
||||||
install -d -m 0755 $(DESTDIR)$(WWCHROOTDIR)
|
install -d -m 0755 $(DESTDIR)$(WWCHROOTDIR)
|
||||||
install -d -m 0755 $(DESTDIR)$(WWPROVISIONDIR)
|
install -d -m 0755 $(DESTDIR)$(WWPROVISIONDIR)
|
||||||
install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTDIR)
|
install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/$(WWCLIENTDIR)
|
||||||
install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/host/$(TFTPDIR)/warewulf/
|
install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/host/rootfs/$(TFTPDIR)/warewulf/
|
||||||
install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/examples
|
install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/examples
|
||||||
install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/ipxe
|
install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/ipxe
|
||||||
install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/grub
|
install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/grub
|
||||||
@@ -116,19 +116,19 @@ install: build docs
|
|||||||
for f in etc/examples/*.ww; do install -m 0644 $$f $(DESTDIR)$(WWCONFIGDIR)/examples/; done
|
for f in etc/examples/*.ww; do install -m 0644 $$f $(DESTDIR)$(WWCONFIGDIR)/examples/; done
|
||||||
for f in etc/ipxe/*.ipxe; do install -m 0644 $$f $(DESTDIR)$(WWCONFIGDIR)/ipxe/; done
|
for f in etc/ipxe/*.ipxe; do install -m 0644 $$f $(DESTDIR)$(WWCONFIGDIR)/ipxe/; done
|
||||||
install -m 0644 etc/grub/grub.cfg.ww $(DESTDIR)$(WWCONFIGDIR)/grub/grub.cfg.ww
|
install -m 0644 etc/grub/grub.cfg.ww $(DESTDIR)$(WWCONFIGDIR)/grub/grub.cfg.ww
|
||||||
install -m 0644 etc/grub/chainload.ww $(DESTDIR)$(WWOVERLAYDIR)/host$(TFTPDIR)/warewulf/grub.cfg.ww
|
install -m 0644 etc/grub/chainload.ww $(DESTDIR)$(WWOVERLAYDIR)/host/rootfs$(TFTPDIR)/warewulf/grub.cfg.ww
|
||||||
(cd overlays && find * -type f -exec install -D -m 0644 {} $(DESTDIR)$(WWOVERLAYDIR)/{} \;)
|
(cd overlays && find * -type f -exec install -D -m 0644 {} $(DESTDIR)$(WWOVERLAYDIR)/{} \;)
|
||||||
(cd overlays && find * -type d -exec mkdir -pv $(DESTDIR)$(WWOVERLAYDIR)/{} \;)
|
(cd overlays && find * -type d -exec mkdir -pv $(DESTDIR)$(WWOVERLAYDIR)/{} \;)
|
||||||
(cd overlays && find * -type l -exec cp -av {} $(DESTDIR)$(WWOVERLAYDIR)/{} \;)
|
(cd overlays && find * -type l -exec cp -av {} $(DESTDIR)$(WWOVERLAYDIR)/{} \;)
|
||||||
chmod 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/init
|
chmod 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/init
|
||||||
chmod 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTDIR)/wwinit
|
chmod 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/$(WWCLIENTDIR)/wwinit
|
||||||
chmod 0600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh*
|
chmod 0600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/etc/ssh/ssh*
|
||||||
chmod 0600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/NetworkManager/system-connections/ww4-managed.ww
|
chmod 0600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww
|
||||||
chmod 0644 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh*.pub.ww
|
chmod 0644 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/etc/ssh/ssh*.pub.ww
|
||||||
chmod 0600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/warewulf/config.ww
|
chmod 0600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/warewulf/config.ww
|
||||||
chmod 0750 $(DESTDIR)$(WWOVERLAYDIR)/host
|
chmod 0750 $(DESTDIR)$(WWOVERLAYDIR)/host/rootfs
|
||||||
install -m 0755 wwctl $(DESTDIR)$(BINDIR)
|
install -m 0755 wwctl $(DESTDIR)$(BINDIR)
|
||||||
install -m 0755 wwclient $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTDIR)/wwclient
|
install -m 0755 wwclient $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/$(WWCLIENTDIR)/wwclient
|
||||||
install -m 0755 wwapic $(DESTDIR)$(BINDIR)
|
install -m 0755 wwapic $(DESTDIR)$(BINDIR)
|
||||||
install -m 0755 wwapid $(DESTDIR)$(BINDIR)
|
install -m 0755 wwapid $(DESTDIR)$(BINDIR)
|
||||||
install -m 0755 wwapird $(DESTDIR)$(BINDIR)
|
install -m 0755 wwapird $(DESTDIR)$(BINDIR)
|
||||||
|
|||||||
@@ -145,7 +145,12 @@ yq e '
|
|||||||
|
|
||||||
%dir %{_sharedstatedir}/warewulf
|
%dir %{_sharedstatedir}/warewulf
|
||||||
%{_sharedstatedir}/warewulf/chroots
|
%{_sharedstatedir}/warewulf/chroots
|
||||||
%{_sharedstatedir}/warewulf/overlays
|
%dir %{_sharedstatedir}/warewulf/overlays
|
||||||
|
%dir %{_sharedstatedir}/warewulf/overlays/debug
|
||||||
|
%dir %{_sharedstatedir}/warewulf/overlays/generic
|
||||||
|
%dir %{_sharedstatedir}/warewulf/overlays/host
|
||||||
|
%dir %{_sharedstatedir}/warewulf/overlays/wwinit
|
||||||
|
%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/*/rootfs
|
||||||
|
|
||||||
%attr(-, root, root) %{_bindir}/wwctl
|
%attr(-, root, root) %{_bindir}/wwctl
|
||||||
%attr(-, root, root) %{_bindir}/wwapi*
|
%attr(-, root, root) %{_bindir}/wwapi*
|
||||||
|
|||||||
Reference in New Issue
Block a user