CVS: moonbase/kernel/linux BUILD,1.14,1.15 POST_INSTALL,1.14,1.15

[niki at lunar-linux.org]

Update of /var/cvs/lunar/moonbase/kernel/linux
In directory dbguin.lunar-linux.org:/tmp/cvs-serv28978

Modified Files:
	BUILD POST_INSTALL 
Log Message:
Reverting elaines changes.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux/BUILD,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- BUILD	3 Oct 2003 21:12:07 -0000	1.14
+++ BUILD	5 Oct 2003 19:51:47 -0000	1.15
@@ -27,17 +27,12 @@
   true
 done			
 
-backup_mods_krnl()  {
-
+backup_modules()  {
   if    [  -d  /lib/modules/$VERSION      ];  then
     rm   -rf   /lib/modules/$VERSION.old
     mv         /lib/modules/$VERSION      \
                /lib/modules/$VERSION.old
   fi
-
-  mv -f /boot/vmlinubz-$VERSION.old /boot/vmlinubz-$VERSION.old_2
-  cp -p /boot/vmlinubz-$VERSION /boot/vmlinubz-$VERSION.old
-
 }
 
 (
@@ -63,10 +58,10 @@
   fi                                         &&
   
   prepare_install                            &&
-  touch /boot/vmlinubz-$VERSION              &&
-  backup_mods_krnl                           &&
+  
   if grep -q "CONFIG_MODULES=y" .config
   then
+    backup_modules                           &&
     make modules_install
   fi                                         &&
   

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux/POST_INSTALL,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- POST_INSTALL	3 Oct 2003 21:12:07 -0000	1.14
+++ POST_INSTALL	5 Oct 2003 19:51:47 -0000	1.15
@@ -11,20 +11,6 @@
 
 }
 
-lilo_old_image_entry()  {
-
-  cat  <<  EOF
-
-image                   =       /boot/vmlinubz-$VERSION.old
-        label           =       old-linux-$VERSION
-        read-only
-
-
-EOF
-}
-
-
-
 grub_image_entry()  {
 
 . $DEPENDS_CONFIG/grub
@@ -39,22 +25,6 @@
 
 }
 
-grub_old_image_entry()  {
-
-. $DEPENDS_CONFIG/grub
-
-  cat  <<  EOF
-
-title   old-linux-$VERSION
-kernel  $GRUB_BOOT/vmlinubz-$VERSION.old
-root    $GRUB_ROOT
-
-EOF
-
-}
-
-
-
 yaboot_image_entry()  {
 
   cat  <<  EOF
@@ -68,9 +38,7 @@
 }
 
 update_lilo()  {
-
-  if  ! ( grep  -q  "vmlinubz-$VERSION"  /etc/lilo.conf   &&
-          grep  -q  "vmlinubz-$VERSION.old" /etc/lilo.conf);  then
+  if  !  grep  -q  "$VERSION"  /etc/lilo.conf;  then
 
     IFS_OLD=$IFS
     export  IFS="
@@ -86,12 +54,7 @@
       if   echo  $LINE  |  grep  -q  "image"  ||
            echo  $LINE  |  grep  -q  "other"  ;  then
         if  (( IMAGE_COUNT  == 0  ));  then
-          if  !  grep  -q  "vmlinubz-$VERSION"  /etc/lilo.conf ; then
-            echo  -e  "`lilo_image_entry`"  >>  /etc/lilo.conf.new
-          fi
-          if  !  grep  -q  "vmlinubz-$VERSION.old"  /etc/lilo.conf;  then
-            echo  -e  "`lilo_old_image_entry`"  >>  /etc/lilo.conf.new
-          fi
+          echo  -e  "`lilo_image_entry`"  >>  /etc/lilo.conf.new
         fi
         ((  IMAGE_COUNT++  ))
       fi
@@ -124,8 +87,7 @@
 
 
 update_grub()  {
-  if  ! ( grep  -q  "vmlinubz-$VERSION"  /boot/grub/menu.lst  &&
-          grep  -q  "vmlinubz-$VERSION.old" /boot/grub/menu.lst );  then
+  if  !  grep  -q  "$VERSION"  /boot/grub/menu.lst;  then
 
     IFS_OLD=$IFS
     export  IFS="
@@ -140,12 +102,7 @@
 
       if   echo  $LINE  |  grep  -q  "title";  then
         if  (( IMAGE_COUNT  == 0  ));  then
-          if  !  grep  -q  "vmlinubz-$VERSION"  /boot/grub/menu.lst;  then
-            echo  -e  "`grub_image_entry`"  >>  /boot/grub/menu.lst.new
-          fi
-          if  !  grep  -q  "vmlinubz-$VERSION.old"  /boot/grub/menu.lst;  then
-            echo  -e  "`grub_old_image_entry`"  >>  /boot/grub/menu.lst.new
-          fi
+          echo  -e  "`grub_image_entry`"  >>  /boot/grub/menu.lst.new
         fi
         ((  IMAGE_COUNT++  ))
       fi