[pbuilder/f20] Fix pbuilder_selinux-ro.patch
Sandro Mani
smani at fedoraproject.org
Sun Dec 7 00:04:55 UTC 2014
commit c2b964e8bff5006c1f26250961f80ba17ea01198
Author: Sandro Mani <manisandro at gmail.com>
Date: Sun Dec 7 01:04:44 2014 +0100
Fix pbuilder_selinux-ro.patch
pbuilder.spec | 5 ++++-
pbuilder_selinux-ro.patch | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/pbuilder.spec b/pbuilder.spec
index fda99b3..92b1170 100644
--- a/pbuilder.spec
+++ b/pbuilder.spec
@@ -1,6 +1,6 @@
Name: pbuilder
Version: 0.215
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Personal package builder for Debian packages
License: GPLv2+
@@ -119,6 +119,9 @@ make check
%changelog
+* Sun Dec 07 2014 Sandro Mani <manisandro at gmail.com> - 0.215-12
+- Fix pbuilder_selinux-ro.patch
+
* Sun Dec 07 2014 Sandro Mani <manisandro at gmail.com> - 0.215-11
- Fix pbuilder_selinux-ro.patch
diff --git a/pbuilder_selinux-ro.patch b/pbuilder_selinux-ro.patch
index a63e8ba..180514e 100644
--- a/pbuilder_selinux-ro.patch
+++ b/pbuilder_selinux-ro.patch
@@ -1,12 +1,12 @@
diff -rupN pbuilder-0.215/pbuilder-modules pbuilder-0.215-new/pbuilder-modules
--- pbuilder-0.215/pbuilder-modules 2013-03-26 09:49:36.000000000 +0100
-+++ pbuilder-0.215-new/pbuilder-modules 2014-12-07 00:34:45.411919087 +0100
++++ pbuilder-0.215-new/pbuilder-modules 2014-12-07 01:00:01.761100280 +0100
@@ -276,7 +276,8 @@ function mountproc () {
if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
log "I: mounting selinux filesystem"
mkdir -p $BUILDPLACE/selinux
- mount -t selinuxfs /selinux "$BUILDPLACE/selinux"
-+ mount --bind /selinux "$BUILDPLACE/selinux"
++ mount --bind /sys/fs/selinux/ "$BUILDPLACE/selinux"
+ mount -o remount,ro,bind "$BUILDPLACE/selinux"
mounted[${#mounted[@]}]="$BUILDPLACE/selinux"
fi
More information about the scm-commits
mailing list