|
[-]
[+]
|
Added |
vdsm-SLE_11_SP3.spec
|
|
|
|
[-]
[+]
|
Added |
vdsm_init-lsbfixes.patch
^
|
| @@ -0,0 +1,36 @@
+--- init/sysvinit/vdsmd.init.in.orig 2013-12-15 20:50:48.867573891 +0100
++++ init/sysvinit/vdsmd.init.in 2013-12-15 20:51:48.019368619 +0100
+@@ -13,8 +13,9 @@
+ ### BEGIN INIT INFO
+ # Provides: vdsmd
+ # Required-Start: $syslog $network
+-# Should-Start: $time
+ # Required-Stop: $syslog
++# Should-Start: $time
++# Should-Stop: $null
+ # Default-Start: 2 3 4 5
+ # Default-Stop: 0 1 6
+ # Description: init script for the VDS management server
+--- init/sysvinit/vdsm-restore-net-config.init.in.orig 2013-12-15 20:46:05.212604476 +0100
++++ init/sysvinit/vdsm-restore-net-config.init.in 2013-12-15 20:50:28.391779636 +0100
+@@ -9,6 +9,9 @@
+ ### BEGIN INIT INFO
+ # Provides: vdsm-restore-net-config
+ # Required-Start: $network
++# Required-Stop: $null
++# Default-Start: 1
++# Default-Stop:
+ # Short-Description: restore network configuration files
+ # Description: roll back the host network configuration to the last \
+ # known-good one.
+--- init/sysvinit/supervdsmd.init.in.orig 2013-12-15 20:44:54.928810813 +0100
++++ init/sysvinit/supervdsmd.init.in 2013-12-15 20:45:58.504595515 +0100
+@@ -12,6 +12,8 @@
+ #
+ ### BEGIN INIT INFO
+ # Provides: supervdsmd
++# Required-Start: $network $remote_fs
++# Required-Stop: $null
+ # Default-Start: 2 3 4 5
+ # Default-Stop: 0 1 6
+ # Description: init script for the Super VDS management server
|
|
[-]
[+]
|
Added |
vdsm_reg-lsb.patch
^
|
| @@ -0,0 +1,21 @@
+--- vdsm_reg/vdsm-reg.init.orig 2013-12-15 20:52:30.495368982 +0100
++++ vdsm_reg/vdsm-reg.init 2013-12-15 20:53:11.315162982 +0100
+@@ -5,6 +5,18 @@
+ # chkconfig: 2345 11 99
+ # description: vdsm registration service
+ #
++### BEGIN INIT INFO
++# Provides: vdsmd
++# Required-Start: $syslog $network
++# Required-Stop: $syslog
++# Should-Start: $time
++# Should-Stop: $null
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
++# Description: vdsm registration service
++# Short-Description: vdsm registration service
++### END INIT INFO
++
+ PIDFILE=/var/run/vdsm-reg.pid
+ LOCKFILE=/var/lock/subsys/vdsm-reg
+ prog=vdsm-reg
|
|
[-]
[+]
|
Added |
vdsm.spec.rej
^
|
| @@ -0,0 +1,156 @@
+***************
+*** 60,66 ****
+ # ./autogen.sh --system
+ # make VERSION={version}-{vdsm_release} dist
+ Source0: %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
+-
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ BuildRequires: python
+--- 62,69 ----
+ # ./autogen.sh --system
+ # make VERSION={version}-{vdsm_release} dist
+ Source0: %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
++ Patch0: vdsm_reg-lsb.patch
++ Patch1: vdsm_init-lsbfixes.patch
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ BuildRequires: python
+***************
+*** 179,188 ****
+ Requires: kernel >= 2.6.32-279.9.1
+ Requires: sanlock >= 2.3-4, sanlock-python
+ Requires: initscripts >= 9.03.31-2.el6_3.1
+ Requires: policycoreutils >= 2.0.83-19.30
+ Requires: policycoreutils-python >= 2.0.83-19.30
+- Requires: python-pthreading
+ Requires: selinux-policy-targeted >= 3.7.19-155
+ Requires: lvm2 >= 2.02.95-10.el6_3.2
+ Requires: logrotate < 3.8.0
+ %endif
+--- 196,207 ----
+ Requires: kernel >= 2.6.32-279.9.1
+ Requires: sanlock >= 2.3-4, sanlock-python
+ Requires: initscripts >= 9.03.31-2.el6_3.1
++ %if 0%{!?suse_version}
+ Requires: policycoreutils >= 2.0.83-19.30
+ Requires: policycoreutils-python >= 2.0.83-19.30
+ Requires: selinux-policy-targeted >= 3.7.19-155
++ %endif
++ Requires: python-pthreading
+ Requires: lvm2 >= 2.02.95-10.el6_3.2
+ Requires: logrotate < 3.8.0
+ %endif
+***************
+*** 241,254 ****
+ Requires: tree
+ Requires: dosfstools
+ Requires: genisoimage
+ Requires: libselinux-python
+ Requires: %{name}-python = %{version}-%{release}
+ Requires: pyparted
+
+ Requires(post): /usr/sbin/saslpasswd2
+ Requires(post): /bin/hostname
+ Requires(post): policycoreutils-python
+ Requires(preun): policycoreutils-python
+
+ %description
+ The VDSM service is required by a Virtualization Manager to manage the
+--- 262,279 ----
+ Requires: tree
+ Requires: dosfstools
+ Requires: genisoimage
++ %if 0%{!?suse_version}
+ Requires: libselinux-python
++ %endif
+ Requires: %{name}-python = %{version}-%{release}
+ Requires: pyparted
+
+ Requires(post): /usr/sbin/saslpasswd2
+ Requires(post): /bin/hostname
++ %if 0%{!?suse_version}
+ Requires(post): policycoreutils-python
+ Requires(preun): policycoreutils-python
++ %endif
+
+ %description
+ The VDSM service is required by a Virtualization Manager to manage the
+***************
+*** 571,577 ****
+
+ %prep
+ %setup -q
+- %if 0%{?rhel} == 6
+ sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
+ %endif
+
+--- 695,703 ----
+
+ %prep
+ %setup -q
++ %patch0
++ %patch1
++ %if 0%{?rhel} == 6 || 0%{?sles_version} == 11
+ sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
+ %endif
+
+***************
+*** 695,713 ****
+ fi
+
+ # hack until we replace core dump with abrt
+- /usr/sbin/semanage fcontext -a -t virt_cache_t '/var/log/core(/.*)?'
+- /sbin/restorecon -R -v /var/log/core
+
+- %if 0%{?rhel}
+ if [ "$1" -eq 1 ] ; then
+- /sbin/chkconfig --add vdsmd
+- /sbin/chkconfig --add supervdsmd
+- /sbin/chkconfig --add vdsm-restore-net-config
+
+ # drop this ugly hack when selinux-policy-3.7.19-195.el6.13 is released
+ /usr/sbin/semanage fcontext -a -s system_u -t virt_var_run_t -r s0 \
+ '/var/run/vdsm(/.*)?'
+- /sbin/restorecon /var/run/vdsm
+ fi
+ %else
+ %if 0%{?with_systemd}
+--- 828,848 ----
+ fi
+
+ # hack until we replace core dump with abrt
++ [ -x /usr/sbin/semanage ] && /usr/sbin/semanage fcontext -a -t virt_cache_t '/var/log/core(/.*)?'
++ [ -x /sbin/restorecon ] && /sbin/restorecon -R -v /var/log/core
+
++ %if 0%{?rhel} || 0%{?sles_version} == 11
+ if [ "$1" -eq 1 ] ; then
++ /sbin/chkconfig --add vdsmd || :
++ /sbin/chkconfig --add supervdsmd || :
++ /sbin/chkconfig --add vdsm-restore-net-config || :
+
+ # drop this ugly hack when selinux-policy-3.7.19-195.el6.13 is released
++ if [ -x /usr/sbin/semanage ] ; then
+ /usr/sbin/semanage fcontext -a -s system_u -t virt_var_run_t -r s0 \
+ '/var/run/vdsm(/.*)?'
++ /sbin/restorecon /var/run/vdsm || :
++ fi
+ fi
+ %else
+ %if 0%{?with_systemd}
+***************
+*** 906,911 ****
+ %config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.d/*.policy
+ %config(noreplace) %{_sysconfdir}/logrotate.d/vdsm
+ %config(noreplace) %{_sysconfdir}/rwtab.d/vdsm
+ %config(noreplace) %{_sysconfdir}/sysctl.d/vdsm
+ %if 0%{?with_systemd}
+ %config(noreplace) %{_sysconfdir}/modules-load.d/vdsm.conf
+--- 1055,1061 ----
+ %config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.d/*.policy
+ %config(noreplace) %{_sysconfdir}/logrotate.d/vdsm
+ %config(noreplace) %{_sysconfdir}/rwtab.d/vdsm
++ %dir %{_sysconfdir}/sysctl.d
+ %config(noreplace) %{_sysconfdir}/sysctl.d/vdsm
+ %if 0%{?with_systemd}
+ %config(noreplace) %{_sysconfdir}/modules-load.d/vdsm.conf
|
