summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Woods <wwoods@redhat.com>2009-03-04 19:00:57 -0500
committerWill Woods <wwoods@redhat.com>2009-03-04 19:00:57 -0500
commit933475051dc11c0898a34739790b5e0729683bea (patch)
tree2d62aa15d473cbf4dc422f25e419948643154841
parentfb306473a65df7c6d3f5e36f61276c53c9a4dfe0 (diff)
downloaddebuginfofs-933475051dc11c0898a34739790b5e0729683bea.zip
debuginfofs-933475051dc11c0898a34739790b5e0729683bea.tar.gz
debuginfofs-933475051dc11c0898a34739790b5e0729683bea.tar.xz
Fix up installation/use of /etc/davfs2/debuginfofs.conf
-rwxr-xr-xdebuginfofs.init2
-rw-r--r--debuginfofs.spec8
2 files changed, 5 insertions, 5 deletions
diff --git a/debuginfofs.init b/debuginfofs.init
index 88dbbd1..e8d63f2 100755
--- a/debuginfofs.init
+++ b/debuginfofs.init
@@ -42,7 +42,7 @@ start() {
echo -n $"Starting debuginfofs: "
mount -t davfs "$BUILDID_URL" "$BUILDID_MOUNTPOINT" \
- -o ro,conf=/etc/davfs2/debuginfo.conf $MOUNT_ARGS
+ -o ro,conf=/etc/davfs2/debuginfofs.conf $MOUNT_ARGS
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/debuginfofs
diff --git a/debuginfofs.spec b/debuginfofs.spec
index 3c66c6e..23d3cbc 100644
--- a/debuginfofs.spec
+++ b/debuginfofs.spec
@@ -42,10 +42,9 @@ Server tools and config files for running a debuginfofs server
%install
rm -rf $RPM_BUILD_ROOT
# client
-mkdir -p $RPM_BUILD_ROOT{%{_initrddir},/etc/sysconfig,/etc/davfs2}
-install -m 0755 debuginfofs.init $RPM_BUILD_ROOT%{_initrddir}/debuginfofs
-install -m 0644 debuginfofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/debuginfofs
-install -m 0644 davfs2-debuginfofs.conf $RPM_BUILD_ROOT/etc/davfs2
+install -D -m 0755 debuginfofs.init $RPM_BUILD_ROOT%{_initrddir}/debuginfofs
+install -D -m 0644 debuginfofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/debuginfofs
+install -D -m 0644 davfs2-debuginfofs.conf $RPM_BUILD_ROOT/etc/davfs2/debuginfofs.conf
# server
mkdir -p $RPM_BUILD_ROOT{/usr/share/debuginfofs,/usr/sbin}
mkdir -p $RPM_BUILD_ROOT/var/{www,cache}/debuginfofs
@@ -89,6 +88,7 @@ fi
%defattr(-,root,root,-)
%doc README.client
%{_initrddir}/debuginfofs
+%config(noreplace) /etc/davfs2/debuginfofs.conf
%config(noreplace) /etc/sysconfig/debuginfofs
%files server