SF.net SVN: morphix: [2376] trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh

Revision: 2376
Author:   bmsleight
Date:     2006-07-30 15:17:40 -0700 (Sun, 30 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/morphix/?rev=2376&view=rev

Log Message:
-----------
Real men commit five times a week

Modified Paths:
--------------
    trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
Modified: trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
===================================================================
--- trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh	2006-07-30 02:13:50 UTC (rev 2375)
+++ trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh	2006-07-30 22:17:40 UTC (rev 2376)
@@ -372,7 +372,10 @@
 	  rm $TMP_SCRIPT	2>/dev/null
 	  if [ "$MM_IS_SET_UP" != "" ]
 	  then
-	    log_and_do_command  "sudo ln -sf /var/tmp /tmp"
+	    log_and_do_not_do_command "#Setting tmp space to normal"
+	    log_and_do_command  "sudo ln -sf /var/tmp /"
+	    log_and_do_command  "sudo sync"
+	    log_and_do_command  "sudo umount /var/tmp/.X11-unix/X0"
 	  fi
 	  exit 0 ;;
 	1) $1 ;;
@@ -472,10 +475,10 @@
  #We can not have got to this stage w/o a setting file.
  source $SETTING_FILE 
  log_and_do_not_do_command "#Setting-up mmorphing"
- log_and_do_command "sudo mount $MNT_POINT -o dev"
+ log_and_do_command "sudo mount $MNT_POINT -o dev,suid"
  log_and_do_command  "sudo mkdir $MNT_POINT/mmorphix 			2>/dev/null"
  log_and_do_command  "sudo chown $WHOAMI.users $MNT_POINT/mmorphix 	2>/dev/null"
- log_and_do_command  "mkdir $MNT_POINT/mmorphix/tmp 			2>/dev/null"
+# log_and_do_command  "mkdir $MNT_POINT/mmorphix/tmp 			2>/dev/null"
  log_and_do_command  "mkdir $MNT_POINT/mmorphix/iso			2>/dev/null"
  log_and_do_command  "mkdir $MNT_POINT/mmorphix/morphing		2>/dev/null"
  log_and_do_command  "mkdir $MNT_POINT/mmorphix/morphed			2>/dev/null"
@@ -489,13 +492,16 @@
 	log_and_do_command_progress "while pidof dd >/dev/null; do sudo kill -USR1 $(pidof dd); \
 	 tail -n 1 $TMP_FILE; sleep 2; done"
  fi
- log_and_do_not_do_command  "#Using HD as /tmp space"
- log_and_do_command  "sudo chmod 1777 $MNT_POINT/mmorphix/tmp"
- log_and_do_command  "sudo cp -axf /tmp/* $MNT_POINT/mmorphix/tmp/"
- #log_and_do_command  "sudo rm /tmp"
- log_and_do_command  "sudo ln -sf $MNT_POINT/mmorphix/tmp /tmp"
- log_and_do_not_do_command  "#Setting-up complete"
- log_file "completed set-up"
+ if [ "$MM_IS_SET_UP" = "" ]
+	then
+	log_and_do_not_do_command  "#Using HD as /tmp space"
+	log_and_do_command  "sudo rm $MNT_POINT/mmorphix/tmp -R		2>/dev/null"
+	log_and_do_command  "sudo cp -axf /var/tmp $MNT_POINT/mmorphix/"
+	log_and_do_command  "sudo mount --bind /var/tmp/.X11-unix/X0 $MNT_POINT/mmorphix/tmp/.X11-unix/X0"
+	log_and_do_command  "sudo sudo ln -sf $MNT_POINT/mmorphix/tmp /"
+	log_and_do_not_do_command  "#Setting-up complete"
+	log_file "completed set-up"
+ fi
  MM_IS_SET_UP="Y"
  main_menu
 }
@@ -555,10 +561,10 @@
 	xdialog_tail_box "$MESSAGE_MINIMORPH_2" "/usr/share/morphing-morphix/MorphixMini-Launch-MM-GUI.xml"
 	xdialog_message "$MESSAGE_MINIMORPH_3"
 	log_and_do_command_progress "sudo morphmini /usr/share/morphing-morphix/MorphixMini-Launch-MM-GUI.xml \
-		$MNT_POINT/mmorphix/morphed/MorphixMini-Launch-MM-GUI"
+		$MNT_POINT/mmorphix/morphed/MorphixMini-Launch-MM-GUI.mod"
 	log_and_do_command_progress "sudo isomorph --add mini \ 
 		$MNT_POINT/mmorphix/morphed/MorphixMini-Launch-MM-GUI.mod \ 
-		$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH $MNT_POINT/mmorphix/iso/tmp.iso"
+		$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH $MNT_POINT/mmorphix/iso/tmp.iso "
 	log_and_do_command "mv -f $MNT_POINT/mmorphix/iso/tmp.iso \ 
 		$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
  fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV