[Lunar-commits] r14527 - in moonbase/trunk/kernel: linux-2.4 linux-2.4-agr linux-2.4-grsec linux-2.4-om linux-2.4-stable linux-2.4-vanilla linux-2.6 linux-2.6-ck linux-2.6-cko linux-2.6-grsec linux-2.6-inotify linux-2.6-mm linux-2.6-prepatch

Auke Kok sofar at lunar-linux.org
Sat Apr 30 14:59:57 UTC 2005


Author: sofar
Date: 2005-04-30 14:59:56 +0000 (Sat, 30 Apr 2005)
New Revision: 14527

Modified:
   moonbase/trunk/kernel/linux-2.4-agr/CONFIGURE
   moonbase/trunk/kernel/linux-2.4-agr/POST_INSTALL
   moonbase/trunk/kernel/linux-2.4-grsec/CONFIGURE
   moonbase/trunk/kernel/linux-2.4-grsec/POST_INSTALL
   moonbase/trunk/kernel/linux-2.4-om/CONFIGURE
   moonbase/trunk/kernel/linux-2.4-om/POST_INSTALL
   moonbase/trunk/kernel/linux-2.4-stable/CONFIGURE
   moonbase/trunk/kernel/linux-2.4-stable/POST_INSTALL
   moonbase/trunk/kernel/linux-2.4-vanilla/CONFIGURE
   moonbase/trunk/kernel/linux-2.4-vanilla/POST_INSTALL
   moonbase/trunk/kernel/linux-2.4/CONFIGURE
   moonbase/trunk/kernel/linux-2.4/POST_INSTALL
   moonbase/trunk/kernel/linux-2.6-ck/CONFIGURE
   moonbase/trunk/kernel/linux-2.6-ck/POST_INSTALL
   moonbase/trunk/kernel/linux-2.6-cko/CONFIGURE
   moonbase/trunk/kernel/linux-2.6-cko/POST_INSTALL
   moonbase/trunk/kernel/linux-2.6-grsec/CONFIGURE
   moonbase/trunk/kernel/linux-2.6-grsec/POST_INSTALL
   moonbase/trunk/kernel/linux-2.6-inotify/CONFIGURE
   moonbase/trunk/kernel/linux-2.6-inotify/POST_INSTALL
   moonbase/trunk/kernel/linux-2.6-mm/CONFIGURE
   moonbase/trunk/kernel/linux-2.6-mm/POST_INSTALL
   moonbase/trunk/kernel/linux-2.6-prepatch/CONFIGURE
   moonbase/trunk/kernel/linux-2.6-prepatch/POST_INSTALL
   moonbase/trunk/kernel/linux-2.6/CONFIGURE
   moonbase/trunk/kernel/linux-2.6/POST_INSTALL
Log:
Getting rid of grub/lilo diversity, all code now calls update_bootloader which updates either grub or lilo (which ever is installed).


Modified: moonbase/trunk/kernel/linux-2.4/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.4/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,5 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-mquery USE_LILO "Configure this kernel to load from lilo?" n
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
 unset_module_config CONFIG_KERNEL

Modified: moonbase/trunk/kernel/linux-2.4/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.4/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,9 +1,4 @@
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo $VERSION-$PVERSION $VERSION
-fi
-if [ "$USE_GRUB" == "y" ]; then
-    update_grub $VERSION-$PVERSION $VERSION
-fi
+update_bootloader $VERSION-$PVERSION $VERSION
 
 #  Reinstall packages that add their own kernel modules
 if  module_installed  ftpfs;          then  lin  ftpfs;          fi

Modified: moonbase/trunk/kernel/linux-2.4-agr/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.4-agr/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4-agr/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,5 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-mquery USE_LILO "Configure this kernel to load from lilo?" n
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
 unset_module_config CONFIG_KERNEL

Modified: moonbase/trunk/kernel/linux-2.4-agr/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.4-agr/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4-agr/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,9 +1,4 @@
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo $VERSION-$PVERSION-agr $VERSION-agr
-fi
-if [ "$USE_GRUB" == "y" ]; then
-    update_grub $VERSION-$PVERSION-agr $VERSION-agr
-fi
+update_bootloader $VERSION-$PVERSION-agr $VERSION-agr
 
 #  Reinstall packages that add their own kernel modules
 if  module_installed  ftpfs;          then  lin  ftpfs;          fi

Modified: moonbase/trunk/kernel/linux-2.4-grsec/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.4-grsec/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4-grsec/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,5 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-mquery USE_LILO "Configure this kernel to load from lilo?" n
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
 unset_module_config CONFIG_KERNEL

Modified: moonbase/trunk/kernel/linux-2.4-grsec/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.4-grsec/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4-grsec/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,9 +1,4 @@
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo $VERSION-$PVERSION-grs $VERSION-grs
-fi
-if [ "$USE_GRUB" == "y" ]; then
-    update_grub $VERSION-$PVERSION-grs $VERSION-grs
-fi
+update_bootloader $VERSION-$PVERSION-grs $VERSION-grs
 
 #  Reinstall packages that add their own kernel modules
 if  module_installed  ftpfs;          then  lin  ftpfs;          fi

Modified: moonbase/trunk/kernel/linux-2.4-om/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.4-om/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4-om/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,5 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-mquery USE_LILO "Configure this kernel to load from lilo?" n
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
 unset_module_config CONFIG_KERNEL

Modified: moonbase/trunk/kernel/linux-2.4-om/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.4-om/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4-om/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,9 +1,4 @@
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo $VERSION-$PVERSION-om $VERSION-om
-fi
-if [ "$USE_GRUB" == "y" ]; then
-    update_grub $VERSION-$PVERSION-om $VERSION-om
-fi
+update_bootloader $VERSION-$PVERSION-om $VERSION-om
 
 #  Reinstall packages that add their own kernel modules
 if  module_installed  ftpfs;          then  lin  ftpfs;          fi

Modified: moonbase/trunk/kernel/linux-2.4-stable/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.4-stable/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4-stable/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,5 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-mquery USE_LILO "Configure this kernel to load from lilo?" n
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
 unset_module_config CONFIG_KERNEL

Modified: moonbase/trunk/kernel/linux-2.4-stable/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.4-stable/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4-stable/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,9 +1,4 @@
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo $VERSION-$PVERSION-stb $VERSION-stb
-fi
-if [ "$USE_GRUB" == "y" ]; then
-    update_grub $VERSION-$PVERSION-stb $VERSION-stb
-fi
+update_bootloader $VERSION-$PVERSION-stb $VERSION-stb
 
 #  Reinstall packages that add their own kernel modules
 if  module_installed  ftpfs;          then  lin  ftpfs;          fi

Modified: moonbase/trunk/kernel/linux-2.4-vanilla/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.4-vanilla/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4-vanilla/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,5 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-mquery USE_LILO "Configure this kernel to load from lilo?" n
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
 unset_module_config CONFIG_KERNEL

Modified: moonbase/trunk/kernel/linux-2.4-vanilla/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.4-vanilla/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.4-vanilla/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,9 +1,4 @@
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo $VERSION $VERSION-vanilla
-fi
-if [ "$USE_GRUB" == "y" ]; then
-    update_grub $VERSION $VERSION-vanilla
-fi
+update_bootloader $VERSION $VERSION-vanilla
 
 #  Reinstall packages that add their own kernel modules
 if  module_installed  ftpfs;          then  lin  ftpfs;          fi

Modified: moonbase/trunk/kernel/linux-2.6/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.6/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,17 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-
-if [ "`get_module_config USE_GRUB`" = "y" ]; then 
-    set_module_config "USE_LILO" "n" ; 
-
-    mquery CONFIG_GRUB "Configure grub?" n
-else 
-    mquery USE_LILO "Configure this kernel to load from lilo?" n
-    
-    if [ "`get_module_config USE_LILO`" = "y" ]; then
-	mquery CONFIG_LILO "Configure lilo?" n    
-    fi     		  
-fi
-
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 
 if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then

Modified: moonbase/trunk/kernel/linux-2.6/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.6/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,10 +1,4 @@
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo $VERSION $VERSION
-else
-  if [ "$USE_GRUB" == "y" ]; then
-    update_grub $VERSION $VERSION
-  fi
-fi
+update_bootloader $VERSION $VERSION
 
 #  Reinstall packages that add their own kernel modules
 

Modified: moonbase/trunk/kernel/linux-2.6-ck/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.6-ck/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-ck/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,17 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-
-if [ "`get_module_config USE_GRUB`" = "y" ]; then 
-    set_module_config "USE_LILO" "n" ; 
-
-    mquery CONFIG_GRUB "Configure grub?" n
-else 
-    mquery USE_LILO "Configure this kernel to load from lilo?" n
-    
-    if [ "`get_module_config USE_LILO`" = "y" ]; then
-	mquery CONFIG_LILO "Configure lilo?" n    
-    fi     		  
-fi
-
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 
 if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then

Modified: moonbase/trunk/kernel/linux-2.6-ck/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.6-ck/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-ck/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,10 +1,4 @@
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo $VERSION $VERSION
-else
-  if [ "$USE_GRUB" == "y" ]; then
-    update_grub $VERSION $VERSION
-  fi
-fi
+update_bootloader $VERSION $VERSION
 
 #  Reinstall packages that add their own kernel modules
 

Modified: moonbase/trunk/kernel/linux-2.6-cko/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.6-cko/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-cko/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,17 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-
-if [ "`get_module_config USE_GRUB`" = "y" ]; then 
-    set_module_config "USE_LILO" "n" ; 
-
-    mquery CONFIG_GRUB "Configure grub?" n
-else 
-    mquery USE_LILO "Configure this kernel to load from lilo?" n
-    
-    if [ "`get_module_config USE_LILO`" = "y" ]; then
-	mquery CONFIG_LILO "Configure lilo?" n    
-    fi     		  
-fi
-
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 
 if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then

Modified: moonbase/trunk/kernel/linux-2.6-cko/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.6-cko/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-cko/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,10 +1,4 @@
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo $VERSION $VERSION
-else
-  if [ "$USE_GRUB" == "y" ]; then
-    update_grub $VERSION $VERSION
-  fi
-fi
+update_bootloader $VERSION $VERSION
 
 #  Reinstall packages that add their own kernel modules
 

Modified: moonbase/trunk/kernel/linux-2.6-grsec/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.6-grsec/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-grsec/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,11 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-
-if [ "`get_module_config USE_GRUB`" = "y" ]; then 
-    set_module_config "USE_LILO" "n" ; 
-else 
-    mquery USE_LILO "Configure this kernel to load from lilo?" n
-fi
-
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 
 if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then

Modified: moonbase/trunk/kernel/linux-2.6-grsec/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.6-grsec/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-grsec/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,8 +1,4 @@
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}  ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}
-elif [ "$USE_GRUB" == "y" ]; then
-    update_grub ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}  ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}
-fi
+update_bootloader ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}  ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}
 
 #  Reinstall packages that add their own kernel modules
 lin -c kernel-reqs

Modified: moonbase/trunk/kernel/linux-2.6-inotify/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.6-inotify/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-inotify/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,17 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-
-if [ "`get_module_config USE_GRUB`" = "y" ]; then
-    set_module_config "USE_LILO" "n" ;
-
-    mquery CONFIG_GRUB "Configure grub?" n
-else
-    mquery USE_LILO "Configure this kernel to load from lilo?" n
-
-    if [ "`get_module_config USE_LILO`" = "y" ]; then
-        mquery CONFIG_LILO "Configure lilo?" n
-    fi
-fi
-
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 
 if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then

Modified: moonbase/trunk/kernel/linux-2.6-inotify/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.6-inotify/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-inotify/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,11 +1,7 @@
 # Done to shorten the boot label for lilo
 LABEL=`echo ${VERSION} | sed 's/-//g'`
 
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo ${VERSION}  ${LABEL}
-elif [ "$USE_GRUB" == "y" ]; then
-    update_grub ${VERSION}  ${LABEL}
-fi
+update_bootloader ${VERSION} ${LABEL}
 
 #  Reinstall packages that add their own kernel modules
 lin -c kernel-reqs

Modified: moonbase/trunk/kernel/linux-2.6-mm/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.6-mm/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-mm/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,17 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-
-if [ "`get_module_config USE_GRUB`" = "y" ]; then 
-    set_module_config "USE_LILO" "n" ; 
-
-    mquery CONFIG_GRUB "Configure grub?" n
-else 
-    mquery USE_LILO "Configure this kernel to load from lilo?" n
-    
-    if [ "`get_module_config USE_LILO`" = "y" ]; then
-	mquery CONFIG_LILO "Configure lilo?" n    
-    fi     		  
-fi
-
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 
 if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then

Modified: moonbase/trunk/kernel/linux-2.6-mm/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.6-mm/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-mm/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,11 +1,7 @@
 # Done to shorten the boot label for lilo
 LABEL=`echo ${VERSION} | sed 's/-//g'`
 
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo ${VERSION}  ${LABEL}
-elif [ "$USE_GRUB" == "y" ]; then
-    update_grub ${VERSION}  ${LABEL}
-fi
+update_bootloader ${VERSION} ${LABEL}
 
 #  Reinstall packages that add their own kernel modules
 lin -c kernel-reqs

Modified: moonbase/trunk/kernel/linux-2.6-prepatch/CONFIGURE
===================================================================
--- moonbase/trunk/kernel/linux-2.6-prepatch/CONFIGURE	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-prepatch/CONFIGURE	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,17 +1,3 @@
-mquery USE_GRUB "Configure this kernel to load from grub?" n
-
-if [ "`get_module_config USE_GRUB`" = "y" ]; then 
-    set_module_config "USE_LILO" "n" ; 
-
-    mquery CONFIG_GRUB "Configure grub?" n
-else 
-    mquery USE_LILO "Configure this kernel to load from lilo?" n
-    
-    if [ "`get_module_config USE_LILO`" = "y" ]; then
-	mquery CONFIG_LILO "Configure lilo?" n    
-    fi     		  
-fi
-
 mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 
 if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then

Modified: moonbase/trunk/kernel/linux-2.6-prepatch/POST_INSTALL
===================================================================
--- moonbase/trunk/kernel/linux-2.6-prepatch/POST_INSTALL	2005-04-30 14:57:12 UTC (rev 14526)
+++ moonbase/trunk/kernel/linux-2.6-prepatch/POST_INSTALL	2005-04-30 14:59:56 UTC (rev 14527)
@@ -1,10 +1,4 @@
-if [ "$USE_LILO" == "y" ]; then
-    update_lilo $VERSION $VERSION
-else
-  if [ "$USE_GRUB" == "y" ]; then
-    update_grub $VERSION $VERSION
-  fi
-fi
+update_bootloader $VERSION $VERSION
 
 #  Reinstall packages that add their own kernel modules
 



More information about the Lunar-commits mailing list