Преглед на файлове

Only do grub setup on first boot

Bob Mottram преди 8 години
родител
ревизия
74bd83ca08
променени са 1 файла, в които са добавени 0 реда и са изтрити 4 реда
  1. 0
    4
      src/freedombone-image-customise

+ 0
- 4
src/freedombone-image-customise Целия файл

1069
 
1069
 
1070
     if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
1070
     if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
1071
         chroot "$rootdir" apt-get -yq install grub2
1071
         chroot "$rootdir" apt-get -yq install grub2
1072
-        sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT="quiet ifnames=0 slub_debug=FZP slab_nomerge page_poison=1"|g' $rootdir/etc/default/grub
1073
-        chroot "$rootdir" update-grub
1074
     fi
1072
     fi
1075
 
1073
 
1076
     chroot "$rootdir" apt-get -yq install locales locales-all debconf
1074
     chroot "$rootdir" apt-get -yq install locales locales-all debconf
1382
 if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'i386' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' ]]; then
1380
 if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'i386' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' ]]; then
1383
     chroot "$rootdir" apt-get install -y cryptsetup zsh pinentry-curses iotop bc
1381
     chroot "$rootdir" apt-get install -y cryptsetup zsh pinentry-curses iotop bc
1384
     chroot "$rootdir" apt-get install -y grub2 hostapd
1382
     chroot "$rootdir" apt-get install -y grub2 hostapd
1385
-    sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT="quiet ifnames=0 slub_debug=FZP slab_nomerge page_poison=1"|g' $rootdir/etc/default/grub
1386
-    chroot "$rootdir" update-grub
1387
 fi
1383
 fi
1388
 
1384
 
1389
 sed -i "s|#host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf
1385
 sed -i "s|#host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf