This commit is contained in:
Bob Mottram 2017-08-06 21:21:51 +01:00
parent db322c02d3
commit b654846c86
2 changed files with 2 additions and 3 deletions

View File

@ -27,7 +27,6 @@ install:
cp img/backgrounds/${APP}_*.png ${DESTDIR}${PREFIX}/share cp img/backgrounds/${APP}_*.png ${DESTDIR}${PREFIX}/share
cp img/avatars/* ${DESTDIR}/usr/share/${APP}/avatars cp img/avatars/* ${DESTDIR}/usr/share/${APP}/avatars
cp src/* ${DESTDIR}${PREFIX}/bin cp src/* ${DESTDIR}${PREFIX}/bin
# cp src/${APP}-controlpanel ${DESTDIR}${PREFIX}/bin/control
cp src/${APP}-mesh-batman ${DESTDIR}${PREFIX}/bin/batman cp src/${APP}-mesh-batman ${DESTDIR}${PREFIX}/bin/batman
cp src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup cp src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup
cp src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup2friends cp src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup2friends

View File

@ -208,7 +208,7 @@ function install_backports_kernel {
} }
function turn_off_rsys_logging { function turn_off_rsys_logging {
if grep -q '/var/log/auth.log' /etc/rsyslog.conf; then if grep -q '/dev/null' /etc/rsyslog.conf; then
return return
fi fi
sed -i 's|mail,news.none.*|mail,news.none /dev/null|g' /etc/rsyslog.conf sed -i 's|mail,news.none.*|mail,news.none /dev/null|g' /etc/rsyslog.conf
@ -270,7 +270,7 @@ function initial_setup {
function setup_grub { function setup_grub {
if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
if ! grep -q 'iframes=0' /etc/default/grub; then if ! grep -q 'ifnames=0' /etc/default/grub; then
sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT="quiet ifnames=0 slub_debug=FZP slab_nomerge page_poison=1"|g' /etc/default/grub sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT="quiet ifnames=0 slub_debug=FZP slab_nomerge page_poison=1"|g' /etc/default/grub
update-grub update-grub
fi fi