SF.net SVN: morphix: [2425] trunk/morph-scripts/mmorphix/ morphing-morphix-gui.sh
[email protected] Sun, 01 Oct 2006 15:22:28 -0700
| Newsgroups | gmane.linux.morphix.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 2425
http://svn.sourceforge.net/morphix/?rev=2425&view=rev
Author: bmsleight
Date: 2006-10-01 15:22:25 -0700 (Sun, 01 Oct 2006)
Log Message:
-----------
Fixing bugs 1552930, 1565310.
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-09-29 21:47:19 UTC (rev 2424)
+++ trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh 2006-10-01 22:22:25 UTC (rev 2425)
@@ -270,6 +270,12 @@
We need to make a iso image for us to morph
We will use this CD and call the image MyMorph.iso"
###########################################################
+MESSAGE_SETTING_TMPFS="Setting up Morphing Morphix
+
+This partition does support file permissions.
+We need to make a 2.5G file on the partition to be used as
+tmp file space. "
+###########################################################
MESSAGE_ISOMORPH="Introduction to isomorph
LiveCD are stored as .iso files. Which can then be written
@@ -740,6 +746,10 @@
log_and_do_command "sudo sync"
log_and_do_command "sudo umount /var/tmp/.X11-unix/X0"
log_and_do_command "sudo rm $MNT_POINT/mmorphix/tmp -R 2>/dev/null"
+ if [ "$DOUBLE_MOUNT" = "Y" ]
+ then
+ log_and_do_command "sudo umount $MNT_POINT/space_mm.tmp"
+ fi
log_and_do_command "sudo umount $MNT_POINT 2>/dev/null"
fi
exit 0 ;;
@@ -750,7 +760,7 @@
###########################################################
# #
-# SECTION 5 : MAIN MENU #
+# SECTION 6 : MAIN MENU #
# #
###########################################################
main_menu ()
@@ -906,6 +916,11 @@
do
HD_IN_MNT="$HD_IN_MNT \"$TMP_HD_IN_MNT\""
done
+ for TMP_HD_IN_MNT in /mnt/sd??
+ do
+ HD_IN_MNT="$HD_IN_MNT \"$TMP_HD_IN_MNT\""
+ done
+
xdialog_radio_select "$MESSAGE_SETTING_SELECT" \
$HD_IN_MNT
echo "MNT_POINT=$TMP_XD_RETURN" >$SETTING_FILE
@@ -914,6 +929,7 @@
source $SETTING_FILE
log_and_do_not_do_command "#Setting-up mmorphing"
log_and_do_command "sudo mount $MNT_POINT -o dev,suid"
+ # cat /etc/mtab | grep hda5 | cut -d\ -f 3
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"
@@ -934,6 +950,26 @@
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"
+ # if the filesystem does not allow permissions on files then
+ # make a file, mount it as ext3. Then use this as tmp space.
+ NONPERM_FS=$(cat /etc/mtab | grep $MNT_POINT | cut -d\ -f 3)
+ if [ "$NONPERM_FS" = "vfat" ]
+ then
+ DOUBLE_MOUNT="Y"
+ if [ ! -f "$MNT_POINT/space_mm.tmp" ]
+ then
+ xdialog_message "$MESSAGE_SETTING_TMPFS"
+ log_and_do_command "sudo dd if=/dev/zero of=$MNT_POINT/space_mm.tmp bs=1MB count=2560 >$TMP_FILE 2>&1 &"
+ log_and_do_command_progress "while pidof dd >/dev/null; do sudo kill -USR1 $(pidof dd); \
+ tail -n 1 $TMP_FILE; sleep 2; done"
+ log_and_do_command_progress "sudo mkfs.ext3 -F $MNT_POINT/space_mm.tmp "
+ log_and_do_command_progress "sudo tune2fs -i 0 -c 0 $MNT_POINT/space_mm.tmp "
+ fi
+ log_and_do_command_progress "mkdir $MNT_POINT/mmorphix/tmp"
+ log_and_do_command_progress "sudo mount -o dev,suid,loop $MNT_POINT/space_mm.tmp $MNT_POINT/mmorphix/tmp"
+ else
+ DOUBLE_MOUNT="N"
+ fi
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 /"
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