[Lunar-commits] r22867 - in lunar-iso/trunk: lunar-install/sbin scripts

[Auke Kok]

Author: sofar
Date: 2007-01-06 19:23:58 +0100 (Sat, 06 Jan 2007)
New Revision: 22867

Added:
   lunar-iso/trunk/scripts/prepare
Modified:
   lunar-iso/trunk/lunar-install/sbin/lunar-install
   lunar-iso/trunk/scripts/initrd
   lunar-iso/trunk/scripts/proper
   lunar-iso/trunk/scripts/rebuild
Log:
2006->2007, templetize initrd size, move broken rebuild detection code to end of rebuild script


Modified: lunar-iso/trunk/lunar-install/sbin/lunar-install
===================================================================
--- lunar-iso/trunk/lunar-install/sbin/lunar-install	2007-01-06 18:21:47 UTC (rev 22866)
+++ lunar-iso/trunk/lunar-install/sbin/lunar-install	2007-01-06 18:23:58 UTC (rev 22867)
@@ -4,8 +4,8 @@
 # portions Copyright 2001 by Kyle Sallee                    #
 # portions Copyright 2002 by Kagan Kongar                   #
 # portions Copyright 2002 by rodzilla                       #
-# portions Copyright 2003, 2004 by tchan, kc8apf            #
-# portions Copyright 2004, 2005, 2006 by Auke Kok           #
+# portions Copyright 2003-2004 by tchan, kc8apf             #
+# portions Copyright 2004-2007 by Auke Kok                  #
 #                                                           #
 #############################################################
 #                                                           #

Modified: lunar-iso/trunk/scripts/initrd
===================================================================
--- lunar-iso/trunk/scripts/initrd	2007-01-06 18:21:47 UTC (rev 22866)
+++ lunar-iso/trunk/scripts/initrd	2007-01-06 18:23:58 UTC (rev 22867)
@@ -119,8 +119,12 @@
 # calculate the size of the initrd image
 SIZE=$(du -kcs BUILD | tail -1 | cut -f1)
 echo "+ estimated $SIZE"
-(( SIZE = SIZE + 1 ))
+# sometimes the size is way off (?) and needs manual adjustment
+# (( SIZE = SIZE + 1 ))
 echo "+ used size $SIZE"
+# and write it to the isolinux cfg
+sed "s/INITRDSIZE/$SIZE/g" $ISO_SOURCE/isolinux/isolinux.cfg.in > $ISO_SOURCE/isolinux/isolinux.cfg
+
 dd if=/dev/zero of=initrd.raw bs=1024 count=$SIZE
 losetup /dev/loop/0 initrd.raw
 mkfs.ext2 -b 1024 -m 0 -i 1024 -N 1024 /dev/loop/0

Added: lunar-iso/trunk/scripts/prepare
===================================================================
--- lunar-iso/trunk/scripts/prepare	                        (rev 0)
+++ lunar-iso/trunk/scripts/prepare	2007-01-06 18:23:58 UTC (rev 22867)
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+. /etc/lunar/config
+
+for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list conf/sources.list conf/sources.list-${ISO_KSUFFIX}) memtest86+ ; do
+  download_module $mod
+done
+


Property changes on: lunar-iso/trunk/scripts/prepare
___________________________________________________________________
Name: svn:executable
   + *

Modified: lunar-iso/trunk/scripts/proper
===================================================================
--- lunar-iso/trunk/scripts/proper	2007-01-06 18:21:47 UTC (rev 22866)
+++ lunar-iso/trunk/scripts/proper	2007-01-06 18:23:58 UTC (rev 22867)
@@ -1,13 +1,5 @@
 #!/bin/bash
 
-echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-echo "+          PRIMARY COMPILE PHASE COMPLETED             +"
-echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-echo ""
-echo "Broken compiles:"
-(cd $ISO_TARGET/var/build && ls -1)
-echo ""
-
 umount $ISO_TARGET/proc &> /dev/null
 umount $ISO_TARGET/dev &> /dev/null
 

Modified: lunar-iso/trunk/scripts/rebuild
===================================================================
--- lunar-iso/trunk/scripts/rebuild	2007-01-06 18:21:47 UTC (rev 22866)
+++ lunar-iso/trunk/scripts/rebuild	2007-01-06 18:23:58 UTC (rev 22867)
@@ -66,6 +66,10 @@
 echo "+          REBUILD FINISHED                            +"
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 
+echo "Broken compiles:"
+(cd $ISO_TARGET/var/build && ls -1)
+echo ""
+
 umount $ISO_TARGET/proc
 
 touch $ISO_TARGET/.rebuild