diff --git a/dracut/simple/init.sh b/dracut/simple/init.sh index 6c8ae0c..132e7f9 100644 --- a/dracut/simple/init.sh +++ b/dracut/simple/init.sh @@ -10,7 +10,7 @@ if [ -e /dev/mapper/dmroot ] ; then echo "Qubes: FATAL error: /dev/mapper/dmroot already exists?!" fi -modprobe xenblk || modprobe xen-blkfront || echo "Qubes: Cannot load Xen Block Frontend..." +/sbin/modprobe xenblk || /sbin/modprobe xen-blkfront || echo "Qubes: Cannot load Xen Block Frontend..." die() { echo "$@" >&2 @@ -47,7 +47,7 @@ if [ `cat /sys/class/block/$ROOT_DEV/ro` = 1 ] ; then if [ $VOLATILE_SIZE -lt $SWAP_SIZE ]; then die "volatile.img smaller than 1GB, cannot continue" fi - sfdisk -q --unit S /dev/xvdc >/dev/null </dev/null </dev/null </dev/null <= 7 +Requires: python34-qubesimgconverter +%else Requires: python3-qubesimgconverter +%endif BuildRequires: qubes-libvchan-devel BuildRequires: python-setuptools %if 0%{?rhel} >= 7 @@ -35,26 +39,38 @@ Common Linux files for Qubes Dom0 and VM Summary: Python package qubesimgconverter Requires: python Requires: pycairo +%if 0%{?rhel} >= 7 +Requires: python-pillow +Requires: numpy +%else Requires: python2-pillow Requires: python2-numpy +%endif %description -n python2-qubesimgconverter Python package qubesimgconverter -%package -n python3-qubesimgconverter -Summary: Python package qubesimgconverter %if 0%{?rhel} >= 7 +%package -n python34-qubesimgconverter +Summary: Python package qubesimgconverter Requires: python34 -Requires: pycairo +Requires: python34-cairo +Requires: python34-pillow +Requires: python34-numpy + +%description -n python34-qubesimgconverter +Python package qubesimgconverter %else +%package -n python3-qubesimgconverter +Summary: Python package qubesimgconverter Requires: python3 Requires: python3-cairo -%endif Requires: python3-pillow Requires: python3-numpy %description -n python3-qubesimgconverter Python package qubesimgconverter +%endif %package devel Summary: Development headers for qubes-utils @@ -120,7 +136,11 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/qubesimgconverter/test_integ.py* %{python_sitelib}/qubesimgconverter-%{version}-py?.?.egg-info +%if 0%{?rhel} >= 7 +%files -n python34-qubesimgconverter +%else %files -n python3-qubesimgconverter +%endif %{python3_sitelib}/qubesimgconverter/__init__.py %{python3_sitelib}/qubesimgconverter/imggen.py %{python3_sitelib}/qubesimgconverter/test.py