[Lunar-commits] CVS: lunar-iso/scripts etc,1.1,1.2

[Auke Kok]

Update of /var/cvs/lunar/lunar-iso/scripts
In directory espresso.foo-projects.org:/tmp/cvs-serv1678/scripts

Modified Files:
	etc 
Log Message:
Better target/source decls


Index: etc
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/etc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- etc	22 Nov 2004 20:43:35 -0000	1.1
+++ etc	23 Nov 2004 13:15:58 -0000	1.2
@@ -15,18 +15,12 @@
 touch $ISO_TARGET/etc/ld.so.conf
 chroot $ISO_TARGET ldconfig
 
-# prepare our moonbase!
-if [ ! -f $ISO_SOURCE/template/moonbase.tar.bz2 ]; then
-  echo "Cannot find template/moonbase.tar.bz2!"
-  exit 1
-fi
-
 (
   echo "+ installing moonbase"
-  cd $ISO_TARGET/var/lib/lunar
-  tar xjf $ISO_SOURCE/template/moonbase.tar.bz2
-  tar tjlf $ISO_SOURCE/template/moonbase.tar.bz2 | sed 's/^/\/var\/lib\/lunar\//g' > $ISO_TARGET/var/log/lunar/install/moonbase-${ISO_DATE}
-  cd $ISO_SOURCE
+  cd $ISO_TARGET/var/lib/lunar && (
+    tar xjf $ISO_SOURCE/template/moonbase.tar.bz2
+    tar tjlf $ISO_SOURCE/template/moonbase.tar.bz2 | sed 's/^/\/var\/lib\/lunar\//g' > $ISO_TARGET/var/log/lunar/install/moonbase-${ISO_DATE}
+  )
   chroot $ISO_TARGET /sbin/lsh add_module moonbase installed $ISO_DATE
   echo "+ installing module.index"
   chroot $ISO_TARGET /sbin/lsh create_module_index