Magellan Linux

Diff of /tags/installer-0_1_0/gtk-gui/diskpartition.sh

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

trunk/installer/gtk-gui/diskpartition.sh revision 719 by niro, Fri Apr 18 20:40:28 2008 UTC tags/installer-0_1_0/gtk-gui/diskpartition.sh revision 1040 by niro, Sun May 30 19:32:27 2010 UTC
# Line 1  Line 1 
1  # $Header: /home/cvsd/magellan-cvs/magellan-src/installer/gtk-gui/diskpartition.sh,v 1.1 2008-04-18 20:40:28 niro Exp $  # $Id$
2    
3  export PARTITION_DRIVE_LIST='  export PARTITION_DRIVE_LIST='
4  <window title="Disk Management" icon-name="gtk-harddisk" window_position="1">  <window title="Disk Management" icon-name="gtk-harddisk" window_position="1">
5   <vbox>   <vbox>
6   <pixmap>   <pixmap>
7   <input file>header.png</input>   <input file>data/header.png</input>
8   </pixmap>   </pixmap>
9   <hbox spacing="200">   <hbox spacing="200">
10   <pixmap>   <pixmap>
# Line 19  export PARTITION_DRIVE_LIST=' Line 19  export PARTITION_DRIVE_LIST='
19   <width>550</width><height>250</height>   <width>550</width><height>250</height>
20   <variable>SELECTED_DISK</variable>   <variable>SELECTED_DISK</variable>
21   <label>disk|partition|size|type|flags|mount|format</label>   <label>disk|partition|size|type|flags|mount|format</label>
22   <input>read_disk.sh</input>   <input>include/read_disk.sh</input>
23   </tree>   </tree>
24    
25   <hbox>   <hbox>
# Line 44  export SETUP_PARTITION=' Line 44  export SETUP_PARTITION='
44  <window title="Disk Management" icon-name="gtk-harddisk" window_position="1">  <window title="Disk Management" icon-name="gtk-harddisk" window_position="1">
45   <vbox>   <vbox>
46   <pixmap>   <pixmap>
47   <input file>header.png</input>   <input file>data/header.png</input>
48   </pixmap>   </pixmap>
49   <hbox spacing="10">   <hbox spacing="10">
50   <pixmap>   <pixmap>
# Line 73  export SETUP_PARTITION=' Line 73  export SETUP_PARTITION='
73   <list>   <list>
74   <width>40</width><height>175</height>   <width>40</width><height>175</height>
75   <variable>FILESYSTEM</variable>   <variable>FILESYSTEM</variable>
76     <item>keep-as-is</item>
77   <item>ext2</item>   <item>ext2</item>
78   <item>ext3</item>   <item>ext3</item>
79   <item>reiserfs</item>   <item>reiserfs</item>
# Line 148  export -f edit_disk_or_partition Line 149  export -f edit_disk_or_partition
149  rundialog_partition_drive_list()  rundialog_partition_drive_list()
150  {  {
151   rundialog PARTITION_DRIVE_LIST   rundialog PARTITION_DRIVE_LIST
152   echo "DEBUG: EXIT='${EXIT}'"   debug "EXIT='${EXIT}'"
153    
154   # save given variables in env   # save given variables in env
155   # they will be shown as default on error   # they will be shown as default on error
# Line 164  rundialog_partition_drive_list() Line 165  rundialog_partition_drive_list()
165   disk="$(echo ${disk} | cut -d: -f1)"   disk="$(echo ${disk} | cut -d: -f1)"
166   mount=$(query_partition_disk_setup --mountpoint ${disk})   mount=$(query_partition_disk_setup --mountpoint ${disk})
167   fs=$(query_partition_disk_setup --filesystem ${disk})   fs=$(query_partition_disk_setup --filesystem ${disk})
168    
169   case ${mount} in   case ${mount} in
170   /)   /)
171   export PARTITION_DISK_ROOT="${disk}"   export PARTITION_DISK_ROOT="${disk}"
# Line 197  rundialog_partition_drive_list() Line 199  rundialog_partition_drive_list()
199   export PARTITION_DISK_OPT="${disk}"   export PARTITION_DISK_OPT="${disk}"
200   export PARTITION_FS_OPT="${fs}"   export PARTITION_FS_OPT="${fs}"
201   ;;   ;;
202   swap) export PARTITION_DISK_SWAP="${disk}" ;;   swap)
203     export PARTITION_DISK_SWAP="${disk}"
204     export PARTITION_FS_SWAP="swap"
205     ;;
206   esac   esac
207   done   done
208    
# Line 270  main_diskpartition() Line 275  main_diskpartition()
275   export PARTITION_DISK_OPT   export PARTITION_DISK_OPT
276   export PARTITION_FS_OPT   export PARTITION_FS_OPT
277   export PARTITION_DISK_SWAP   export PARTITION_DISK_SWAP
278     export PARTITION_FS_SWAP
279  }  }

Legend:
Removed from v.719  
changed lines
  Added in v.1040