[Lunar-commits] r14659 - lunar-iso/trunk/lunar-install/sbin

[Auke Kok]

Author: sofar
Date: 2005-05-08 13:40:34 +0000 (Sun, 08 May 2005)
New Revision: 14659

Modified:
   lunar-iso/trunk/lunar-install/sbin/lunar-install
Log:
Don't do this the hard way. should fix lockfile problem as reported by jasper ;^)


Modified: lunar-iso/trunk/lunar-install/sbin/lunar-install
===================================================================
--- lunar-iso/trunk/lunar-install/sbin/lunar-install	2005-05-08 13:07:04 UTC (rev 14658)
+++ lunar-iso/trunk/lunar-install/sbin/lunar-install	2005-05-08 13:40:34 UTC (rev 14659)
@@ -613,10 +613,10 @@
 
         # setup list of installed packages etc.
         echo "moonbase:%ISO_DATE%:installed:%ISO_DATE%:37M" >> $TARGET/var/state/lunar/packages
-	chroot_run lsh create_module_index
-	chroot_run lsh create_depends_cache
-	chroot_run lsh update_plugins
-	chroot_run lunar fixdepends
+	cp /var/state/lunar/depends        $TARGET/var/state/lunar/
+	cp /var/state/lunar/depends.backup $TARGET/var/state/lunar/
+	cp /var/state/lunar/depends.cache  $TARGET/var/state/lunar/
+	cp /var/state/lunar/module.index   $TARGET/var/state/lunar/
 
         # pass through some of the configuration at this point:
 	[ -z "$KEYMAP" ] || echo "$KEYMAP" > $TARGET/etc/keymap
@@ -626,10 +626,12 @@
         [ -z "$EDITOR" ] || echo "export EDITOR=\"$EDITOR\"" > $TARGET/etc/profile.d/editor.rc
 	
         if [ -n "$HPROXY" -o -n "$FPROXY" -o -n "$NPROXY" ]; then
-	    > $TARGET/etc/profile.d/proxy.rc
-	    [ -z "$HPROXY" ] || echo "export http_proxy=\"$HPROXY\"" >> $TARGET/etc/profile.d/proxy.rc
-            [ -z "$FPROXY" ] || echo "export ftp_proxy=\"$FPROXY\"" >> $TARGET/etc/profile.d
-            [ -z "$NPROXY" ] || echo "export no_proxy=\"$NPROXY\"" >> $TARGET/etc/profile.d
+	(
+	    echo "# these proxy settings apply to wget only"
+	    [ -z "$HPROXY" ] || echo "export http_proxy=\"$HPROXY\""
+            [ -z "$FPROXY" ] || echo "export ftp_proxy=\"$FPROXY\""
+            [ -z "$NPROXY" ] || echo "export no_proxy=\"$NPROXY\""
+	) > $TARGET/etc/profile.d/proxy.rc
         fi
 
         echo -e "$FSTAB" >> etc/fstab