Browse Source

Separate grub update

Bob Mottram 8 years ago
parent
commit
5fe06e923f
1 changed files with 12 additions and 2 deletions
  1. 12
    2
      src/freedombone-utils-setup

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

225
 
225
 
226
     if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
226
     if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
227
         apt-get -yq install grub2
227
         apt-get -yq install grub2
228
-        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
229
-        update-grub
230
     fi
228
     fi
231
 
229
 
232
     if [ ! -d $INSTALL_DIR ]; then
230
     if [ ! -d $INSTALL_DIR ]; then
236
     mark_completed $FUNCNAME
234
     mark_completed $FUNCNAME
237
 }
235
 }
238
 
236
 
237
+function setup_grub {
238
+    if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
239
+        if ! grep -q 'iframes=0' /etc/default/grub; then
240
+            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
241
+            update-grub
242
+        fi
243
+    fi
244
+}
245
+
239
 function admin_user_sudo {
246
 function admin_user_sudo {
240
     if ! grep -q "$MY_USERNAME  ALL=(ALL) ALL" $rootdir/etc/sudoers; then
247
     if ! grep -q "$MY_USERNAME  ALL=(ALL) ALL" $rootdir/etc/sudoers; then
241
         echo "$MY_USERNAME  ALL=(ALL) ALL" >> $rootdir/etc/sudoers
248
         echo "$MY_USERNAME  ALL=(ALL) ALL" >> $rootdir/etc/sudoers
748
     function_check initial_setup
755
     function_check initial_setup
749
     initial_setup
756
     initial_setup
750
 
757
 
758
+    function_check setup_grub
759
+    setup_grub
760
+
751
     function_check install_tor
761
     function_check install_tor
752
     install_tor
762
     install_tor
753
 
763