Skip to content

Commit

Permalink
Make the chgrp non fatal.
Browse files Browse the repository at this point in the history
In some build environments the chgrp to the right daemon group may fail
so we mark it as non fatal for now.
  • Loading branch information
Marco van Wieringen committed Feb 17, 2015
1 parent 57e0f17 commit 5569c60
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion platforms/packaging/bareos.spec
Expand Up @@ -618,7 +618,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
# This is not a config file, but we need what %config is able to do
# the query.sql can be personalized by end user.
# a rpmlint rule is add to filter the warning
#%config(noreplace) %{script_dir}/query.sql
%config(noreplace) %{script_dir}/query.sql

%files storage
# sd package (bareos-sd, bls, btape, bcopy, bextract)
Expand Down
2 changes: 1 addition & 1 deletion src/dird/Makefile.in
Expand Up @@ -135,7 +135,7 @@ install: all
fi; \
echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
@if test "x${dir_group}" != "x"; then \
-@if test "x${dir_group}" != "x"; then \
chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
fi
@if test -f ${DESTDIR}${scriptdir}/query.sql; then \
Expand Down
2 changes: 1 addition & 1 deletion src/filed/Makefile.in
Expand Up @@ -139,7 +139,7 @@ install: all
fi; \
echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
@if test "x${fd_group}" != "x"; then \
-@if test "x${fd_group}" != "x"; then \
chgrp -f ${fd_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
fi
@if test -f static-bareos-fd; then \
Expand Down
2 changes: 1 addition & 1 deletion src/stored/Makefile.in
Expand Up @@ -163,7 +163,7 @@ install: all
fi; \
echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
@if test "x${sd_group}" != "x"; then \
-@if test "x${sd_group}" != "x"; then \
chgrp -f ${sd_group} ${DESTDIR}${sysconfdir}/$$destconf; \
fi
@if test -f static-bareos-sd; then \
Expand Down

0 comments on commit 5569c60

Please sign in to comment.