[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

Chris Lamb lamby at debian.org
Fri Jul 30 02:52:35 UTC 2010


The following commit has been merged in the master branch:
commit 0b1690e539d70452b2dcbda3fd35baddc139d324
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jul 29 14:19:13 2010 -0400

    Generate lh_config line for each Config
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/live_studio/config/models.py b/live_studio/config/models.py
index 5043925..ffa4662 100644
--- a/live_studio/config/models.py
+++ b/live_studio/config/models.py
@@ -82,3 +82,20 @@ class Config(models.Model):
     @models.permalink
     def get_absolute_url(self):
         return 'config:view', (self.pk,)
+
+    def options(self):
+        try:
+            language = self.locale.split('_')[0]
+        except:
+            language = 'en'
+
+        return (
+            '--architecture', self.architecture,
+            '--packages-lists', self.base,
+            '--distribution', self.distribution,
+            '--binary-images', self.media_type,
+            '--debian-installer', self.installer,
+            '--language', language,
+            '--bootappend_live',
+                'locale=%s keyb=%s' % (self.locale, self.keyboard_layout),
+        )
diff --git a/templates/config/view.html b/templates/config/view.html
index a6331ae..782491c 100644
--- a/templates/config/view.html
+++ b/templates/config/view.html
@@ -17,4 +17,6 @@
 <dd>{{ config.base }}</dd>
 </dl>
 
+<p><tt>lh_config {{ config.options|command_line_options }} &amp;&amp; sudo lh_build</tt></p>
+
 {% endblock %}

-- 
live-studio



More information about the debian-live-changes mailing list