/[clonezilla-sysresccd]/trunk/create-clonezilla-sysresccd/patch-clonezilla-sysresccd.sh
ViewVC logotype

Diff of /trunk/create-clonezilla-sysresccd/patch-clonezilla-sysresccd.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 93 by sng, Fri Aug 13 08:30:37 2010 UTC revision 104 by sng, Mon Sep 6 14:09:54 2010 UTC
# Line 85  done Line 85  done
85  }  }
86    
87  function isClonezillaSysRescCDRunning(){  function isClonezillaSysRescCDRunning(){
88  if [ -e /live/image/README.txt ] || [ -e /mnt/livecd/README.txt ];then  if [ -e /live/image/restorecd/what-cd ] || [ -e /restorecd/what-cd ];then
89    ClonezillaSysRescCDRunning='y'    ClonezillaSysRescCDRunning='y'
90  fi  fi
91  }  }
# Line 94  fi Line 94  fi
94  function cleanUp(){  function cleanUp(){
95  cd  cd
96  echo -n "Cleanning up...   "  echo -n "Cleanning up...   "
97    [ -z "$inputFileMounted" ] || umount "$mountPoint" 2>/dev/null
98    [ -z "$savePartitionMounted" ] || umount "$savePartition" 2>/dev/null
99  [ -z "$mountPointCreated" ] || rmdir "$mountPoint" 2>/dev/null  [ -z "$mountPointCreated" ] || rmdir "$mountPoint" 2>/dev/null
100  [ -z "$newIsoCreated" ] || {  [ -z "$newIsoCreated" ] || {
101    [ -z "$keepFiles" ] && rm -rf "$savePartitionMountPoint"/new-iso 2>/dev/null    [ -z "$keepFiles" ] && rm -rf "$savePartitionMountPoint"/new-iso 2>/dev/null
# Line 102  echo -n "Cleanning up...   " Line 104  echo -n "Cleanning up...   "
104    rmdir "$savePartitionMountPoint"/new-iso 2>/dev/null    rmdir "$savePartitionMountPoint"/new-iso 2>/dev/null
105    rmdir "$savePartitionMountPoint" 2>/dev/null    rmdir "$savePartitionMountPoint" 2>/dev/null
106  }  }
 [ -z "$inputFileMounted" ] || umount "$mountPoint" 2>/dev/null  
 [ -z "$savePartitionMounted" ] || umount "$savePartition" 2>/dev/null  
107  echo "done"  echo "done"
108  }  }
109    
# Line 143  fi Line 143  fi
143  #                                                                            #  #                                                                            #
144  ##############################################################################  ##############################################################################
145  if [ -z "$workingFromCD" ];then  if [ -z "$workingFromCD" ];then
146          genisoimage --version >/dev/null 2>&1 && MKISO=genisoimage || MKISO=mkisofs    genisoimage --version >/dev/null 2>&1 && MKISO=genisoimage || MKISO=mkisofs
147    savePartitionMountPoint=/root/tmp/savePartition.$$    savePartitionMountPoint=/root/tmp/savePartition.$$
148  else  else
149    MKISO=genisoimage    MKISO=genisoimage
# Line 189  echo "done" Line 189  echo "done"
189    
190  ####### Script starts here #######  ####### Script starts here #######
191    
 # set -x  
192  while getopts ":i:o:s:r:t:fp:bdwnvhl:k:" Option  while getopts ":i:o:s:r:t:fp:bdwnvhl:k:" Option
193  do  do
194   case $Option in   case $Option in
# Line 334  test "$(whoami)" = "root" || noRoot Line 333  test "$(whoami)" = "root" || noRoot
333  #   echo "    Error: Parameter -t (boot screen title) not specified!!!"  #   echo "    Error: Parameter -t (boot screen title) not specified!!!"
334  #   exit 1  #   exit 1
335  # }  # }
   
336  [ -z "$outputFile" ] && {  [ -z "$outputFile" ] && {
337    outputFile=$(basename "$0").$$.iso    outputFile=$(basename "$0").$$.iso
338    burnISO='y'    burnISO='y'
# Line 346  test "$(whoami)" = "root" || noRoot Line 344  test "$(whoami)" = "root" || noRoot
344    exit 1    exit 1
345  }  }
346    
347  [ -n "$burnISO" ] || {  [ -n "$burnISO" ] && {
348    [ -z "$cdWritter" ] && {    [ -z "$cdWritter" ] && {
349      WHAT_CD=$(which what-cd)      WHAT_CD=$(which what-cd)
350      [ -z "$WHAT_CD" ] && {      [ -z "$WHAT_CD" ] && {
# Line 365  test "$(whoami)" = "root" || noRoot Line 363  test "$(whoami)" = "root" || noRoot
363      }      }
364    }    }
365  }  }
   
366  printVersion  printVersion
367    set -x
368  echo -n "Mounting files...   "  echo -n "Mounting files...   "
369  isClonezillaSysRescCDRunning  isClonezillaSysRescCDRunning
370    
# Line 385  if [ -z $(mount | grep "$inputFile" | se Line 382  if [ -z $(mount | grep "$inputFile" | se
382      # working with ClonezillaSysRescCD      # working with ClonezillaSysRescCD
383      mountPoint=/mountPoint.$$      mountPoint=/mountPoint.$$
384    fi    fi
385      mountOptions="-oro"
386    if [ -z "$workingFromCD" ];then    if [ -z "$workingFromCD" ];then
387      # working with ClonezillaSysRescCD image      # working with ClonezillaSysRescCD image
388      mountOptions="-oloop"      mountOptions="-oloop"
# Line 406  if [ -z $(mount | grep "$inputFile" | se Line 404  if [ -z $(mount | grep "$inputFile" | se
404    fi    fi
405  else  else
406    # our inputFile is mounted!!!    # our inputFile is mounted!!!
407    mountPoint=$(mount | grep "$inputFile" | grep 's|.* on \(.*\) type .*)|\1|')    mountPoint=$(mount | grep "$inputFile" | sed 's|.* on \(.*\) type .*)|\1|')
408  fi  fi
409  ##############################################################################  ##############################################################################
410    
# Line 423  if [ -n "$(mount | grep "$savePartition" Line 421  if [ -n "$(mount | grep "$savePartition"
421          # can i write to it?          # can i write to it?
422    savePartitionMountPoint=$(mount | grep "$savePartition" | sed "s|"$savePartition" on \(.*\) type .*)|\1|")    savePartitionMountPoint=$(mount | grep "$savePartition" | sed "s|"$savePartition" on \(.*\) type .*)|\1|")
423          rm -rf "$savePartitionMountPoint"/new-iso 2>/dev/null          rm -rf "$savePartitionMountPoint"/new-iso 2>/dev/null
424          mkdir "$savePartitionMountPoint"/new-iso 2>/dev/null || {          mkdir "$savePartitionMountPoint"/new-iso 2>/dev/null && newIsoCreated='y' || {
425      echo      echo
426            echo "    Error: Partition $savePartition is already mounted read-only"            echo "    Error: Partition $savePartition is already mounted read-only"
427                  exit 1                  exit 1
# Line 479  if [ ! -z "$mainTitle" ];then Line 477  if [ ! -z "$mainTitle" ];then
477  fi  fi
478  if [ -e "$mainSplash" ];then  if [ -e "$mainSplash" ];then
479    cp "$mainSplash" "$savePartitionMountPoint"/new-iso/isolinux/ocswp.png    cp "$mainSplash" "$savePartitionMountPoint"/new-iso/isolinux/ocswp.png
480      cp "$mainSplash" "$savePartitionMountPoint"/new-iso/syslinux/ocswp.png
481    if [ -e "$restoreSplash" ];then    if [ -e "$restoreSplash" ];then
482      cp "$restoreSplash" "$savePartitionMountPoint"/new-iso/restorecd/default-restore-ocswp.png      cp "$restoreSplash" "$savePartitionMountPoint"/new-iso/restorecd/default-restore-ocswp.png
483      cp "$restoreSplash" "$savePartitionMountPoint"/new-iso/restorecd/ocswp.png      cp "$restoreSplash" "$savePartitionMountPoint"/new-iso/restorecd/ocswp.png
# Line 521  echo -n "Press ENTER to create the ISO f Line 520  echo -n "Press ENTER to create the ISO f
520  read  read
521    
522  outputFile="$savePartitionMountPoint"/"$outputFile"  outputFile="$savePartitionMountPoint"/"$outputFile"
523    genisoimage --version >/dev/null 2>&1 && MKISO=genisoimage || MKISO=mkisofs
524  $MKISO -r -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat \  $MKISO -r -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat \
525  -no-emul-boot -boot-load-size 4 -boot-info-table \  -no-emul-boot -boot-load-size 4 -boot-info-table \
526  "$savePartitionMountPoint"/new-iso \  "$savePartitionMountPoint"/new-iso \
# Line 564  $MKISO -r -J -l -b isolinux/isolinux.bin Line 563  $MKISO -r -J -l -b isolinux/isolinux.bin
563          if [ -n "$chIsoHyb" ];then          if [ -n "$chIsoHyb" ];then
564                                    echo found                                    echo found
565            echo -n "Isohybriding  $outFile...  "            echo -n "Isohybriding  $outFile...  "
566            isohybrid "$outFile"            isohybrid "$outputFile"
567            echo 'done'            echo 'done'
568                                  else                                  else
569                                    echo not found                                    echo not found

Legend:
Removed from v.93  
changed lines
  Added in v.104

webmaster@linux.gr
ViewVC Help
Powered by ViewVC 1.1.26