Bob Mottram 7 years ago
parent
commit
b654846c86
2 changed files with 2 additions and 3 deletions
  1. 0
    1
      Makefile
  2. 2
    2
      src/freedombone-utils-setup

+ 0
- 1
Makefile View File

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

+ 2
- 2
src/freedombone-utils-setup View File

@@ -208,7 +208,7 @@ function install_backports_kernel {
208 208
 }
209 209
 
210 210
 function turn_off_rsys_logging {
211
-    if grep -q '/var/log/auth.log' /etc/rsyslog.conf; then
211
+    if grep -q '/dev/null' /etc/rsyslog.conf; then
212 212
         return
213 213
     fi
214 214
     sed -i 's|mail,news.none.*|mail,news.none      /dev/null|g' /etc/rsyslog.conf
@@ -270,7 +270,7 @@ function initial_setup {
270 270
 
271 271
 function setup_grub {
272 272
     if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
273
-        if ! grep -q 'iframes=0' /etc/default/grub; then
273
+        if ! grep -q 'ifnames=0' /etc/default/grub; then
274 274
             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
275 275
             update-grub
276 276
         fi