This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 5 +-
default_config/defaults.cfg | 4 +-
gui/gui.py | 50 +
gui/image-creator.glade | 1080 +++++++++++++-------
image-creator | 12 +-
libs/InstallImage.py | 141 +++-
libs/Project.py | 14 +
moblin-image-creator.spec | 7 +
.../initramfs/modules | 2 +
.../initramfs/modules | 2 +
.../mccaslin-lpia-ubuntu-hardy/initramfs/modules | 2 +
platforms/mccaslin-lpia-ume/initramfs/modules | 2 +
platforms/mccaslin-lpia/initramfs/modules | 2 +
.../initramfs/modules | 2 +
.../initramfs/modules | 2 +
.../menlow-lpia-ubuntu-hardy-ppa/initramfs/modules | 2 +
.../menlow-lpia-ubuntu-hardy/initramfs/modules | 2 +
platforms/menlow-lpia-ume/initramfs/modules | 2 +
platforms/menlow-lpia/initramfs/modules | 2 +
po/ja.po | 71 ++-
20 files changed, 998 insertions(+), 408 deletions(-)
New commits:
commit 3e919258aa825df4de2291148a69d66215016a13
Merge: 4452083d45d26985b8fd91fbe206b3d3850a570b
bc6659d35103b5cb039ba1fe2b77e3ebb3501e2f
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Thu Oct 30 11:57:15 2008 +0900
Merge branch 'master' of ssh://[EMAIL
PROTECTED]/home/repos/tools/moblin-image-creator
Conflicts:
debian/changelog
gui/gui.py
gui/image-creator.glade
image-creator
libs/InstallImage.py
moblin-image-creator.spec
platforms/mccaslin-lpia-ubuntu-hardy-ppa/initramfs/modules
platforms/mccaslin-lpia-ubuntu-hardy/initramfs/modules
platforms/mccaslin-lpia-ume/initramfs/modules
platforms/menlow-lpia-ubuntu-hardy-jax10-snapshot1/initramfs/modules
platforms/menlow-lpia-ubuntu-hardy/initramfs/modules
platforms/menlow-lpia-ume/initramfs/modules
platforms/menlow-lpia/initramfs/modules
po/ja.po
commit 4452083d45d26985b8fd91fbe206b3d3850a570b
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Thu Oct 30 11:47:21 2008 +0900
Rebase with nfsboot function. Fixed some comments and install_kernels()
arguments.
commit 2d6f4f1117dccec6be92e4ef20c2422d75bc9153
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Wed Oct 22 16:10:09 2008 +0900
Added error handling and modified destination of isolinux.bin LiveIsoImage.
commit 8f5f6753d30913862234259c944bd68af455a515
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Oct 10 17:29:07 2008 +0900
Added the Create Install CD.
commit 0dc59809862472158da90da12bc17216eb589e08
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Wed Oct 22 10:13:22 2008 +0900
Added NFS Live CD Image function.
commit 2f333bc75cc49d069e6ac7830871e141e88ee1e3
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Tue Oct 14 17:43:51 2008 +0900
Added NFS Live USB Image function.
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index 3e7b56b..fa9dd40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,12 @@ moblin-image-creator (0.47) gaston; urgency=low
[ Mitsutaka Amano ]
* Added the Create Install CD.
+ * Added NFS Live USB Image function.
+ * Added NFS Live CD Image function.
* Added error handling and modified destination of isolinux.bin LiveIsoImage.
+ * Rebase with nfsboot function. Fixed some comments and install_kernels()
arguments.
- -- Mitsutaka Amano <[EMAIL PROTECTED]> Wed, 22 Oct 2008 16:07:54 +0900
+ -- Mitsutaka Amano <[EMAIL PROTECTED]> Thu, 30 Oct 2008 11:43:46 +0900
moblin-image-creator (0.46) gaston; urgency=low
diff --git a/default_config/defaults.cfg b/default_config/defaults.cfg
index bb037be..1be83ec 100644
--- a/default_config/defaults.cfg
+++ b/default_config/defaults.cfg
@@ -46,7 +46,7 @@ buildroot_extras = squashfs-tools dosfstools syslinux
module-init-tools mtools g
buildroot_packages = initramfs-tools debhelper devscripts liburi-perl
kernel-package dpatch grub libncursesw5-dev libncurses5-dev man less vim
apt-utils libgtk2.0-dev ssh automake autotools-dev build-essential
gtk-doc-tools dh-make hildon-desktop libhildon-1-dev libhildonfm2-dev
hildon-desktop-dev
# Target configurations
-target_configs = welcome_message usb_kernel_cmdline usb_ext3fs_size
hd_kernel_cmdline hd_swap_option hd_use_squashfs hd_swap_partition_size
hd_boot_partition_size hd_fat32_partition_size cd_kernel_cmdline
nand_kernel_cmdline nand_image_size
+target_configs = welcome_message usb_kernel_cmdline usb_ext3fs_size
usb_nfs_ipaddr hd_kernel_cmdline hd_swap_option hd_use_squashfs
hd_swap_partition_size hd_boot_partition_size hd_fat32_partition_size
cd_kernel_cmdline cd_nfs_ipaddr nand_kernel_cmdline nand_image_size
# Boot welcome message
welcome_message = Welcome to Moblin:
@@ -54,6 +54,7 @@ welcome_message = Welcome to Moblin:
# Options for USB flash drive
usb_kernel_cmdline = initrd=initrd.img boot=usb
usb_ext3fs_size = 100
+usb_nfs_ipaddr = 127.0.0.1
# Options for the hard drive on the device
hd_kernel_cmdline = ro boot=disk resume=/dev/sda3
@@ -65,6 +66,7 @@ hd_fat32_partition_size = 0
# Options for the CD drive
cd_kernel_cmdline = initrd=initrd.img boot=cd
+cd_nfs_ipaddr = 127.0.0.1
# Options for the NAND
nand_kernel_cmdline = ro no-hlt boot=nand single console=ttyMS0
earlyprintk=serial apic=debug idle=poll loglevel=8
diff --git a/gui/gui.py b/gui/gui.py
index cafec64..93d267b 100644
--- a/gui/gui.py
+++ b/gui/gui.py
@@ -88,8 +88,10 @@ class App(object):
"on_install_group": self.on_install_group,
"on_create_liveUSB_clicked": self.on_liveUSB_clicked,
"on_create_liveRWUSB_clicked": self.on_liveRWUSB_clicked,
+ "on_create_NFSliveUSB_clicked": self.on_NFSliveUSB_clicked,
"on_create_installUSB_clicked": self.on_installUSB_clicked,
"on_create_liveCD_clicked": self.on_liveCD_clicked,
+ "on_create_NFSliveCD_clicked": self.on_NFSliveCD_clicked,
"on_create_installCD_clicked": self.on_installCD_clicked,
"on_create_NAND_btn_clicked": self.on_NAND_clicked,
"on_about_activate": self.on_about_activate,
@@ -236,9 +238,11 @@ class App(object):
# Items which should be enabled if our selected target has an fset
self.buttons.create_liveusb.set_sensitive(fset_state)
self.buttons.create_liverwusb.set_sensitive(fset_state)
+ self.buttons.create_nfsliveusb.set_sensitive(fset_state)
self.buttons.create_installusb.set_sensitive(fset_state)
self.buttons.target_config.set_sensitive(fset_state)
self.buttons.create_liveCD.set_sensitive(fset_state)
+ self.buttons.create_nfsliveCD.set_sensitive(fset_state)
self.buttons.create_installCD.set_sensitive(fset_state)
self.buttons.create_NAND.set_sensitive(fset_state)
self.buttons.Write_USB.set_sensitive(fset_state)
@@ -928,6 +932,28 @@ class App(object):
self.show_error_dialog()
progress_dialog.destroy()
+ def on_NFSliveUSB_clicked(self, widget):
+ project = self.current_project()
+ target = self.current_target()
+ result, img_name = self.getImageName()
+ if result == gtk.RESPONSE_OK:
+ progress_tree = gtk.glade.XML(self.gladefile, 'ProgressDialog')
+ progress_dialog = progress_tree.get_widget('ProgressDialog')
+ progress_dialog.connect('delete_event', self.ignore)
+ progress_tree.get_widget('progress_label').set_text(_("Please wait
while creating %s") % img_name)
+ self.progressbar = progress_tree.get_widget('progressbar')
+ try:
+ mic_cmd = 'image-creator --command=create-nfslive-usb
--project-name=\'' + project.name + '\' --target-name=\'' + target.name + '\'
--image-name=\'' + img_name + '\''
+ self.append_cmd_list(mic_cmd)
+ self.current_project().create_nfslive_usb(target.name,
img_name)
+ except ValueError, e:
+ self.show_error_dialog(e.args[0])
+ except:
+ traceback.print_exc()
+ if debug: print_exc_plus()
+ self.show_error_dialog()
+ progress_dialog.destroy()
+
def on_installUSB_clicked(self, widget):
project = self.current_project()
target = self.current_target()
@@ -974,6 +1000,28 @@ class App(object):
self.show_error_dialog()
progress_dialog.destroy()
+ def on_NFSliveCD_clicked(self, widget):
+ project = self.current_project()
+ target = self.current_target()
+ result, img_name = self.getImageName(default_name=".iso")
+ if result == gtk.RESPONSE_OK:
+ progress_tree = gtk.glade.XML(self.gladefile, 'ProgressDialog')
+ progress_dialog = progress_tree.get_widget('ProgressDialog')
+ progress_dialog.connect('delete_event', self.ignore)
+ progress_tree.get_widget('progress_label').set_text(_("Please wait
while creating %s") % img_name)
+ self.progressbar = progress_tree.get_widget('progressbar')
+ try:
+ mic_cmd = 'image-creator --command=create-nfslive-iso
--project-name=\'' + project.name + '\' --target-name=\'' + target.name + '\'
--image-name=\'' + img_name + '\''
+ self.append_cmd_list(mic_cmd)
+ self.current_project().create_nfslive_iso(target.name,
img_name)
+ except ValueError, e:
+ self.show_error_dialog(e.args[0])
+ except:
+ traceback.print_exc()
+ if debug: print_exc_plus()
+ self.show_error_dialog()
+ progress_dialog.destroy()
+
def on_installCD_clicked(self, widget):
project = self.current_project()
target = self.current_target()
@@ -1923,8 +1971,10 @@ class MainWindowButtons(object):
# Action buttons
self.create_liveusb = widgets.get_widget('create_liveUSB_btn')
self.create_liverwusb = widgets.get_widget('create_liveRWUSB_btn')
+ self.create_nfsliveusb = widgets.get_widget('create_NFSliveUSB_btn')
self.create_installusb = widgets.get_widget('create_installUSB_btn')
self.create_liveCD = widgets.get_widget('create_liveCD_btn')
+ self.create_nfsliveCD = widgets.get_widget('create_NFSliveCD_btn')
self.create_installCD = widgets.get_widget('create_installCD_btn')
self.create_NAND = widgets.get_widget('create_NAND_btn')
# Terminal button
diff --git a/gui/image-creator.glade b/gui/image-creator.glade
index 172b654..b4b8db5 100644
--- a/gui/image-creator.glade
+++ b/gui/image-creator.glade
@@ -1926,6 +1926,73 @@
</child>
<child>
+ <widget class="GtkButton"
id="create_NFSliveUSB_btn">
+ <property name="visible">True</property>
+ <property
name="sensitive">False</property>
+ <property name="tooltip"
translatable="yes">Create a Live USB image that can be burned to a USB flash
drive You can boot linux and run completely off the USB flash drive. Nothing
is written to the target device. Boot and mount to nfs server rootfs. You can
use the storage on nfs server. This image is very small(about 60MB).</property>
+ <property name="can_focus">True</property>
+ <property
name="relief">GTK_RELIEF_NORMAL</property>
+ <property
name="focus_on_click">True</property>
+ <signal name="clicked"
handler="on_create_NFSliveUSB_clicked"/>
+
+ <child>
+ <widget class="GtkVBox" id="vbox28">
+ <property
name="visible">True</property>
+ <property
name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkImage"
id="image24">
+ <property
name="visible">True</property>
+ <property
name="stock">gtk-network</property>
+ <property
name="icon_size">4</property>
+ <property
name="xalign">0.5</property>
+ <property
name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="padding">0</property>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel"
id="label39">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">NFS Live USB</property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property
name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property
name="xalign">0.5</property>
+ <property
name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property
name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property
name="angle">0</property>
+ </widget>
+ <packing>
+ <property
name="padding">0</property>
+ <property
name="expand">False</property>
+ <property
name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkButton"
id="create_installUSB_btn">
<property name="visible">True</property>
<property
name="sensitive">False</property>
@@ -2072,6 +2139,72 @@
</child>
<child>
+ <widget class="GtkButton"
id="create_NFSliveCD_btn">
+ <property name="visible">True</property>
+ <property
name="sensitive">False</property>
+ <property name="tooltip"
translatable="yes">Create an installation image that can be burned to a CD. You
can boot linux and run completely off the CD. Nothing is written to the target
device. Boot and mount to nfs server rootfs. You can use the storage on nfs
server. This image is very small(about 60MB).</property>
+ <property name="can_focus">True</property>
+ <property
name="relief">GTK_RELIEF_NORMAL</property>
+ <property
name="focus_on_click">True</property>
+ <signal name="clicked"
handler="on_create_NFSliveCD_clicked"/>
+ <child>
+ <widget class="GtkVBox" id="vbox37">
+ <property
name="visible">True</property>
+ <property
name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkImage"
id="image25">
+ <property
name="visible">True</property>
+ <property
name="stock">gtk-network</property>
+ <property
name="icon_size">4</property>
+ <property
name="xalign">0.5</property>
+ <property
name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property
name="padding">0</property>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel"
id="label40">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">NFS Live CD</property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property
name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property
name="xalign">0.5</property>
+ <property
name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property
name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property
name="angle">0</property>
+ </widget>
+ <packing>
+ <property
name="padding">0</property>
+ <property
name="expand">False</property>
+ <property
name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkButton"
id="create_installCD_btn">
<property name="visible">True</property>
<property
name="sensitive">False</property>
@@ -2080,15 +2213,14 @@
<property
name="relief">GTK_RELIEF_NORMAL</property>
<property
name="focus_on_click">True</property>
<signal name="clicked"
handler="on_create_installCD_clicked"/>
-
<child>
- <widget class="GtkVBox" id="vbox28">
+ <widget class="GtkVBox" id="vbox38">
<property
name="visible">True</property>
<property
name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <widget class="GtkImage"
id="image24">
+ <widget class="GtkImage"
id="image26">
<property
name="visible">True</property>
<property
name="stock">gtk-goto-bottom</property>
<property
name="icon_size">4</property>
@@ -2105,7 +2237,7 @@
</child>
<child>
- <widget class="GtkLabel"
id="label39">
+ <widget class="GtkLabel"
id="label41">
<property
name="visible">True</property>
<property name="label"
translatable="yes">Install CD</property>
<property
name="use_underline">False</property>
@@ -3716,40 +3848,19 @@
</child>
<child>
- <widget class="GtkCheckButton" id="usb_use_squashfs">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label75">
+ <widget class="GtkLabel" id="label78">
+ <property name="width_request">200</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Use
squashfs:</property>
+ <property name="label" translatable="yes"><b>USB boot
configuration</b></property>
<property name="use_underline">False</property>
- <property name="use_markup">False</property>
+ <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="ypad">10</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -3758,8 +3869,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -3786,27 +3897,47 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label78">
- <property name="width_request">200</property>
+ <widget class="GtkSpinButton" id="usb_ext3fs_size">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>USB boot
configuration</b></property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
