[Lunar-commits] CVS: theedge/bin lvu,1.70,1.71

[Auke Kok]

Update of /var/cvs/lunar/theedge/bin
In directory espresso.foo-projects.org:/home/sofar/active/theedge/bin

Modified Files:
	lvu 
Log Message:
Rewrote snapshot handling: *ONLY* consider lunar configs, leave /etc/ out... it just doesn't add anything and breaks more.


Index: lvu
===================================================================
RCS file: /var/cvs/lunar/theedge/bin/lvu,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- lvu	21 Apr 2005 10:32:22 -0000	1.70
+++ lvu	21 Apr 2005 11:33:12 -0000	1.71
@@ -111,18 +111,8 @@
 
 
 export_snapshot()  {
-  SOURCE_DIRECTORY=$BUILD_DIRECTORY/snapshot
-  mk_source_dir $SOURCE_DIRECTORY
-  cp -a /etc $SOURCE_DIRECTORY
-  cp -a $CONFIG_CACHE $SOURCE_DIRECTORY
-
-  cat $MODULE_STATUS >> /usr/src/snapshot/packages
-
-  SNAPSHOT="/root/snapshot-$HOSTNAME-$(date -u +%Y%m%d).tar.bz2"
-
-  cd $BUILD_DIRECTORY
-  tar -c snapshot | bzip2  -9 > $SNAPSHOT
-  rm_source_dir $SOURCE_DIRECTORY
+  SNAPSHOT=snapshot-$HOSTNAME-$(date -u +%Y%m%d)
+  tar cjfP "/root/$SNAPSHOT.tar.bz2" $CONFIG_CACHE $MODULE_STATUS
   message "${MESSAGE_COLOR}Snapshot ${DEFAULT_COLOR}${FILE_COLOR}$SNAPSHOT${DEFAULT_COLOR}${MESSAGE_COLOR} created.${DEFAULT_COLOR}"
 }
 
@@ -133,10 +123,13 @@
 
   if [ -f "$1" ] ; then
     ( mk_source_dir $SOURCE_DIRECTORY )
-    bzcat $SNAPSHOT | tar -x -C $BUILD_DIRECTORY
+    tar xj -C $SOURCE_DIRECTORY -f $SNAPSHOT 2> /dev/null
     cd $SOURCE_DIRECTORY
+    
+	message "${MESSAGE_COLOR}Restoring lunar configuration${DEFAULT_COLOR}"
+    cp -a etc/lunar /etc
 
-    for LINE in $(cat packages) ; do
+    for LINE in $(cat .$MODULE_STATUS) ; do
       LIST="$LIST $(echo $LINE | cut -d: -f1)"
     done
     verbose_msg "Sorting update queue"
@@ -156,12 +149,8 @@
     QUEUE=$(cat $TMP_QUEUE)
     temp_destroy $TMP_QUEUE
 
-    message "${MESSAGE_COLOR}Restoring system configuration${DEFAULT_COLOR}"
-    cp -ai local /etc/lunar
-    cp -ai etc /
-
     if [ -n "$QUEUE" ] ; then
-      lin -c $QUEUE
+      lin -p $QUEUE
     fi
 
     cd /