Bob Mottram 7 gadus atpakaļ
vecāks
revīzija
b654846c86
2 mainītis faili ar 2 papildinājumiem un 3 dzēšanām
  1. 0
    1
      Makefile
  2. 2
    2
      src/freedombone-utils-setup

+ 0
- 1
Makefile Parādīt failu

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

+ 2
- 2
src/freedombone-utils-setup Parādīt failu

208
 }
208
 }
209
 
209
 
210
 function turn_off_rsys_logging {
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
         return
212
         return
213
     fi
213
     fi
214
     sed -i 's|mail,news.none.*|mail,news.none      /dev/null|g' /etc/rsyslog.conf
214
     sed -i 's|mail,news.none.*|mail,news.none      /dev/null|g' /etc/rsyslog.conf
270
 
270
 
271
 function setup_grub {
271
 function setup_grub {
272
     if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
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
             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
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
             update-grub
275
             update-grub
276
         fi
276
         fi