/[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 63 by sng, Wed May 26 20:30:21 2010 UTC revision 64 by sng, Fri May 28 09:47:17 2010 UTC
# Line 94  fi Line 94  fi
94  function cleanUp(){  function cleanUp(){
95  cd  cd
96  echo -n "Cleanning up...   "  echo -n "Cleanning up...   "
 [ -z "$inputFileMounted" ] || umount "$mountPoint" 2>/dev/null  
97  [ -z "$mountPointCreated" ] || rmdir "$mountPoint" 2>/dev/null  [ -z "$mountPointCreated" ] || rmdir "$mountPoint" 2>/dev/null
 [ -z "$savePartitionMounted" ] || umount "$savePartition" 2>/dev/null  
98  [ -z "$newIsoCreated" ] || {  [ -z "$newIsoCreated" ] || {
99    [ -z "$keepFiles" ] && rm -rf "$savePartitionMountPoint"/new-iso 2>/dev/null    [ -z "$keepFiles" ] && rm -rf "$savePartitionMountPoint"/new-iso 2>/dev/null
100  }  }
# Line 104  echo -n "Cleanning up...   " Line 102  echo -n "Cleanning up...   "
102    rmdir "$savePartitionMountPoint"/new-iso 2>/dev/null    rmdir "$savePartitionMountPoint"/new-iso 2>/dev/null
103    rmdir "$savePartitionMountPoint" 2>/dev/null    rmdir "$savePartitionMountPoint" 2>/dev/null
104  }  }
105    [ -z "$inputFileMounted" ] || umount "$mountPoint" 2>/dev/null
106    [ -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
147    savePartitionMountPoint=/root/tmp/savePartition.$$    savePartitionMountPoint=/root/tmp/savePartition.$$
148  else  else
149      MKISO=genisoimage
150    savePartitionMountPoint=/savePartition.$$    savePartitionMountPoint=/savePartition.$$
151  fi  fi
152  mkdir -p "$savePartitionMountPoint" 2>/dev/null && savePartitionMountPointCreated='y' || {  mkdir -p "$savePartitionMountPoint" 2>/dev/null && savePartitionMountPointCreated='y' || {
# Line 174  if [ -z "$savePartitionMounted" ];then Line 176  if [ -z "$savePartitionMounted" ];then
176  fi  fi
177  # is it writeable?  # is it writeable?
178    rm -rf "$savePartitionMountPoint"/new-iso 2>/dev/null    rm -rf "$savePartitionMountPoint"/new-iso 2>/dev/null
179          mkdir "$savePartitionMountPoint"/new-iso 2>/dev/null || {          mkdir "$savePartitionMountPoint"/new-iso 2>/dev/null && newIsoCreated='y' || {
180      echo      echo
181            echo "    Error: Partition $savePartition is mounted read-only"            echo "    Error: Partition $savePartition is mounted read-only"
182                  exit 1                  exit 1
# Line 201  do Line 203  do
203    ;;    ;;
204   i) # input file or cdrom device   i) # input file or cdrom device
205      test "$(whoami)" = "root" || noRoot      test "$(whoami)" = "root" || noRoot
206      [ -s "$OPTARG" ] || {      [ -e "$OPTARG" ] || {
207        echo "    Error: The specified file \"$OPTARG\" cannot be found"        echo "    Error: The specified file \"$OPTARG\" cannot be found"
208        exit 1        exit 1
209      }      }
# Line 244  do Line 246  do
246        exit 1        exit 1
247      fi      fi
248      if [ -z "$(fdisk -l "$OPTARG" 2>/dev/null)" ];then      if [ -z "$(fdisk -l "$OPTARG" 2>/dev/null)" ];then
249        echo "    Error: Parameter -c (storage partition) is not a a valid partition"        echo "    Error: Parameter -p (storage partition) is not a a valid partition"
250        exit 1        exit 1
251      fi      fi
252      savePartition="$OPTARG"      savePartition="$OPTARG"
# Line 441  fi Line 443  fi
443    
444  echo -n "Copying files...   "  echo -n "Copying files...   "
445    
446    
447    if [ -z "$workingFromCD" ];then
448    
449  cp -r "$mountPoint"/* "$savePartitionMountPoint"/new-iso 2>/dev/null && {  cp -r "$mountPoint"/* "$savePartitionMountPoint"/new-iso 2>/dev/null && {
450    echo "done"    echo "done"
451  } || {  } || {
# Line 451  cp -r "$mountPoint"/* "$savePartitionMou Line 456  cp -r "$mountPoint"/* "$savePartitionMou
456  }  }
457    
458    
459    else
460    
461    for n in "$mountPoint"/*;do
462    if [ "$n" != "$savePartitionMountPoint" ] && [ "$n" != "/proc" \ && [ "$n" != "/sys" ];then
463      cp -r "mountPoint"/"$n" "$savePartitionMountPoint"/new-iso 2>/dev/null || {
464        echo "failed"
465        echo
466        cleanUp
467        exit 1
468      }
469    fi
470    done
471    fi
472    
473  echo -n "Installing new files...   "  echo -n "Installing new files...   "
474  if [ ! -z "$mainTitle" ];then  if [ ! -z "$mainTitle" ];then
475    for n in $(find "$savePartitionMountPoint"/new-iso -iname "*.cfg");do    for n in $(find "$savePartitionMountPoint"/new-iso -iname "*.cfg");do
476      sed "0,/^MENU TITLE.*/s//MENU TITLE $mainTitle/" "$n"  > "$n".$$      sed "s/^MENU TITLE  *Clonezilla-SysRescCD .*$/MENU TITLE $mainTitle/" "$n"  > "$n".$$
477      mv "$n".$$ "$n"      mv "$n".$$ "$n"
478    done    done
479  fi  fi
# Line 503  read Line 522  read
522    
523  outputFile="$savePartitionMountPoint"/"$outputFile"  outputFile="$savePartitionMountPoint"/"$outputFile"
524    
525  mkisofs -r -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat \  $MKISO -r -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat \
526  -no-emul-boot -boot-load-size 4 -boot-info-table \  -no-emul-boot -boot-load-size 4 -boot-info-table \
527  "$savePartitionMountPoint"/new-iso \  "$savePartitionMountPoint"/new-iso \
528  | \  | \
# Line 540  mkisofs -r -J -l -b isolinux/isolinux.bi Line 559  mkisofs -r -J -l -b isolinux/isolinux.bi
559        fi        fi
560        [ -z "$deleteISO" ] && {        [ -z "$deleteISO" ] && {
561          echo          echo
562            echo -n "Looking for iohybrid executable...   "
563            chIsoHyb=`type isohybrid 2>/dev/null`
564            if [ -n "$chIsoHyb" ];then
565                                      echo found
566              echo -n "Isohybriding  $outFile...  "
567              isohybrid "$outFile"
568              echo 'done'
569                                    else
570                                      echo not found
571            fi
572          echo "ISO file: \"$outputFile\""          echo "ISO file: \"$outputFile\""
573        };;        };;
574     esac     esac

Legend:
Removed from v.63  
changed lines
  Added in v.64

webmaster@linux.gr
ViewVC Help
Powered by ViewVC 1.1.26