瀏覽代碼

Separate grub update

Bob Mottram 8 年之前
父節點
當前提交
5fe06e923f
共有 1 個檔案被更改,包括 12 行新增2 行删除
  1. 12
    2
      src/freedombone-utils-setup

+ 12
- 2
src/freedombone-utils-setup 查看文件

@@ -225,8 +225,6 @@ function initial_setup {
225 225
 
226 226
     if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
227 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 228
     fi
231 229
 
232 230
     if [ ! -d $INSTALL_DIR ]; then
@@ -236,6 +234,15 @@ function initial_setup {
236 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 246
 function admin_user_sudo {
240 247
     if ! grep -q "$MY_USERNAME  ALL=(ALL) ALL" $rootdir/etc/sudoers; then
241 248
         echo "$MY_USERNAME  ALL=(ALL) ALL" >> $rootdir/etc/sudoers
@@ -748,6 +755,9 @@ function setup_utils {
748 755
     function_check initial_setup
749 756
     initial_setup
750 757
 
758
+    function_check setup_grub
759
+    setup_grub
760
+
751 761
     function_check install_tor
752 762
     install_tor
753 763