Merge pull request #4253 from hallyn/2023-01-09/overlay

[mirror_lxc.git] / lxc.spec.in

diff --git a/lxc.spec.in b/lxc.spec.in
index 004ced2688e5b9cbf5506fcb2befc2edb78f5fcb..7ed9685bd15415dd0c5b5ca1296c81226dd8600e 100644 (file)
--- a/lxc.spec.in
+++ b/lxc.spec.in
@@ -29,9 +29,9 @@
 # BuildRequires systemd-units on fedora and rhel
 %if 0%{?fedora} >= 14 || 0%{?rhel} >= 7
 BuildRequires: systemd-units
+%endif
 #
 # BuildRequires systemd on openSUSE and SUSE
-%endif
 %if 0%{?suse_version} >= 1210
 BuildRequires: systemd
 %endif
@@ -91,6 +91,13 @@ BuildRequires:  libseccomp-devel
 %endif
 %endif
 
+#
+# Additional package for Tizen
+#
+%if %{defined tizen_version}
+BuildRequires:  pkgconfig(dlog)
+%endif
+
 %description
 Containers are insulated areas inside a system, which have their own namespace
 for filesystem, network, PID, IPC, CPU and memory allocation and which can be
@@ -118,6 +125,10 @@ development of the Linux containers.
 %prep
 %setup -q -n %{name}-%{version}%{?beta_dot}
 %build
+
+#Dont use pkgconfig to get bash completion dir and use backwards compatible location.
+export bashcompdir=%{_sysconfdir}/bash_completion.d
+
 PATH=$PATH:/usr/sbin:/sbin %configure $args \
 %if "x%{_unitdir}" != "x"
   --with-systemdsystemunitdir=%{_unitdir} \
@@ -145,6 +156,11 @@ fi
 
 %post
 # This test should trigger a network configure on a new install.
+if [ ! -d @LXC_DISTRO_SYSCONF@ ]
+then
+       mkdir -p @LXC_DISTRO_SYSCONF@
+fi
+
 if [ ! -f @LXC_DISTRO_SYSCONF@/lxc-net ] || ! grep -q 'USE_LXC_BRIDGE=' @LXC_DISTRO_SYSCONF@/lxc-net
 then
        # Grab a random 10net subnet.  Need to add test logic...
@@ -182,6 +198,10 @@ LXC_DHCP_MAX="253"
 # container 'mail1' always get ip address 10.0.3.100.
 #LXC_DHCP_CONFILE=/etc/lxc/dnsmasq.conf
 
+# Whether to use nftables (if available) to configure required network rules.
+# Set to any value != "true" to force iptables backend instead.
+LXC_USE_NFT="true"
+
 # Uncomment the next line if you want lxcbr0's dnsmasq to resolve the .lxc
 # domain.  You can then add "server=/lxc/10.0.3.1' (or your actual $LXC_ADDR)
 # to /etc/dnsmasq.conf, after which 'container1.lxc' will resolve on your
@@ -235,6 +255,7 @@ fi
 %{_unitdir}/lxc-net.service
 %{_unitdir}/lxc.service
 %{_unitdir}/lxc@.service
+%{_unitdir}/lxc-monitord.service
 %else
 %{_sysconfdir}/rc.d/init.d/lxc
 %{_sysconfdir}/rc.d/init.d/lxc-net
@@ -244,6 +265,7 @@ fi
 %defattr(-,root,root)
 %{_sbindir}/*
 %{_libdir}/*.so.*
+%{_libdir}/*.a
 %{_libdir}/%{name}
 %{_localstatedir}/*
 %{_libexecdir}/%{name}/hooks/unmount-namespace