* Fri Mar 17 2006 Dan Walsh <dwalsh@redhat.com> 1.30-1
- Update to upstream
This commit is contained in:
parent
ec67d7567a
commit
bf143127c4
@ -951,28 +951,42 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.
|
|||||||
+#endif
|
+#endif
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30/scripts/fixfiles
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30/scripts/fixfiles
|
||||||
--- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500
|
--- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500
|
||||||
+++ policycoreutils-1.30/scripts/fixfiles 2006-03-17 15:37:21.000000000 -0500
|
+++ policycoreutils-1.30/scripts/fixfiles 2006-03-17 16:26:25.000000000 -0500
|
||||||
@@ -124,7 +124,10 @@
|
@@ -124,7 +124,15 @@
|
||||||
exit $?
|
exit $?
|
||||||
fi
|
fi
|
||||||
if [ ! -z "$DIRS" ]; then
|
if [ ! -z "$DIRS" ]; then
|
||||||
- ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
|
- ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
|
||||||
|
+ if [ -x /usr/bin/find ]; then
|
||||||
+ for d in ${DIRS} ; do find $d \
|
+ for d in ${DIRS} ; do find $d \
|
||||||
+ ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o -print; \
|
+ ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o -print; \
|
||||||
+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $1 -v -f - 2>&1 >> $LOGFILE
|
+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $1 -v -f - 2>&1 >> $LOGFILE
|
||||||
+ done
|
+ done
|
||||||
|
+ else
|
||||||
|
+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
exit $?
|
exit $?
|
||||||
fi
|
fi
|
||||||
LogReadOnly
|
LogReadOnly
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-1.30/scripts/Makefile
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-1.30/scripts/Makefile
|
||||||
--- nsapolicycoreutils/scripts/Makefile 2005-12-08 12:59:25.000000000 -0500
|
--- nsapolicycoreutils/scripts/Makefile 2005-12-08 12:59:25.000000000 -0500
|
||||||
+++ policycoreutils-1.30/scripts/Makefile 2006-03-17 15:37:21.000000000 -0500
|
+++ policycoreutils-1.30/scripts/Makefile 2006-03-17 16:27:22.000000000 -0500
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
# Installation directories.
|
||||||
|
PREFIX ?= ${DESTDIR}/usr
|
||||||
|
BINDIR ?= $(PREFIX)/bin
|
||||||
|
-SBINDIR ?= $(PREFIX)/sbin
|
||||||
|
+SBINDIR ?= $(DESTDIR)/sbin
|
||||||
|
MANDIR ?= $(PREFIX)/share/man
|
||||||
|
LOCALEDIR ?= /usr/share/locale
|
||||||
|
|
||||||
@@ -13,7 +13,7 @@
|
@@ -13,7 +13,7 @@
|
||||||
-mkdir -p $(BINDIR)
|
-mkdir -p $(BINDIR)
|
||||||
install -m 755 $(TARGETS) $(SBINDIR)
|
install -m 755 $(TARGETS) $(SBINDIR)
|
||||||
install -m 755 chcat $(BINDIR)
|
install -m 755 chcat $(BINDIR)
|
||||||
- install -m 755 fixfiles $(DESTDIR)/sbin
|
- install -m 755 fixfiles $(DESTDIR)/sbin
|
||||||
+ install -m 755 fixfiles $(PREFIX)/sbin
|
+ install -m 755 fixfiles $(SBINDIR)
|
||||||
-mkdir -p $(MANDIR)/man8
|
-mkdir -p $(MANDIR)/man8
|
||||||
install -m 644 fixfiles.8 $(MANDIR)/man8/
|
install -m 644 fixfiles.8 $(MANDIR)/man8/
|
||||||
install -m 644 genhomedircon.8 $(MANDIR)/man8/
|
install -m 644 genhomedircon.8 $(MANDIR)/man8/
|
||||||
|
Loading…
Reference in New Issue
Block a user