r2782 - dists/trunk/live-magic/livemagic/model
lamby-guest at alioth.debian.org
lamby-guest at alioth.debian.org
Fri Aug 17 19:18:34 UTC 2007
Author: lamby-guest
Date: 2007-08-17 19:18:34 +0000 (Fri, 17 Aug 2007)
New Revision: 2782
Removed:
dists/trunk/live-magic/livemagic/model/spec.yaml
Modified:
dists/trunk/live-magic/livemagic/model/live_helper_configuration.py
Log:
Removes spec.yaml
Modified: dists/trunk/live-magic/livemagic/model/live_helper_configuration.py
===================================================================
--- dists/trunk/live-magic/livemagic/model/live_helper_configuration.py 2007-08-17 14:15:57 UTC (rev 2781)
+++ dists/trunk/live-magic/livemagic/model/live_helper_configuration.py 2007-08-17 19:18:34 UTC (rev 2782)
@@ -7,6 +7,94 @@
from key_var_config_file import KeyVarConfigFile
from folder_of_files import FolderOfFiles
+spec_str = """
+key_value:
+ common:
+ LH_APT : string
+ LH_APT_FTPPROXY : string
+ LH_APT_HTTPPROXY : string
+ LH_APT_PDIFFS : boolean
+ LH_APT_PIPELINE : int
+ LH_APT_RECOMMENDS : boolean
+ LH_APT_SECURE : boolean
+ LH_BOOTSTRAP : string
+ LH_CACHE_INDICES : boolean
+ LH_CACHE_PACKAGES : boolean
+ LH_CACHE_STAGES : list
+ LH_DEBCONF_FRONTEND : string
+ LH_DEBCONF_NOWARNINGS : boolean
+ LH_DEBCONF_PRIORITY : string
+ LH_GENISOIMAGE : string
+ LH_INITRAMFS : string
+ LH_LOSETUP : string
+ LH_MODE : string
+ LH_ROOT_COMMAND : string
+ LH_TASKSEL : string
+ LIVE_ROOT : string
+ LIVE_INCLUDES : string
+ LIVE_TEMPLATES : string
+ LH_BREAKPOINTS : boolean
+ LH_DEBUG : boolean
+ LH_FORCE : boolean
+ LH_QUIET : boolean
+ LH_VERBOSE : boolean
+
+ bootstrap:
+ LIVE_ARCHITECTURE : list
+ LIVE_BOOTSTRAP_CONFIG : string
+ LIVE_BOOTSTRAP_FLAVOUR : string
+ LIVE_BOOTSTRAP_KEYRING : string
+ LIVE_DISTRIBUTION : string
+ LIVE_MIRROR_BOOTSTRAP : string
+ LIVE_MIRROR_BOOTSTRAP_SECURITY : string
+ LIVE_MIRROR_BINARY : string
+ LIVE_MIRROR_BINARY_SECURITY : string
+ LIVE_SECTIONS : list
+
+ chroot:
+ LIVE_CHROOT_FILESYSTEM : string
+ LIVE_UNION_FILESYSTEM : string
+ LIVE_HOOKS : list
+ LIVE_INTERACTIVE : boolean
+ LIVE_KEYRING_PACKAGES : list
+ LIVE_LANGUAGE : string
+ LIVE_LINUX_FLAVOURS : list
+ LIVE_LINUX_PACKAGES : list
+ LIVE_PACKAGES : list
+ LIVE_PACKAGES_LISTS : string
+ LIVE_PRESEED : string
+ LIVE_TASKS : list
+ LIVE_SECURITY : boolean
+ LIVE_SYMLINKS : boolean
+ LIVE_SYSVINIT : boolean
+
+ binary:
+ LIVE_BINARY_IMAGES : string
+ LIVE_BINARY_INDICES : boolean
+ LIVE_BOOTAPPEND : string
+ LIVE_BOOTLOADER : string
+ LIVE_DEBIAN_INSTALLER : boolean
+ LIVE_ENCRYPTION : string
+ LIVE_GRUB_SPLASH : string
+ LIVE_HOSTNAME : string
+ LIVE_ISO_APPLICATION : string
+ LIVE_ISO_PREPARER : string
+ LIVE_ISO_PUBLISHER : string
+ LIVE_ISO_VOLUME : string
+ LIVE_MEMTEST : string
+ LIVE_NET_PATH : string
+ LIVE_NET_SERVER : string
+ LIVE_SYSLINUX_SPLASH : string
+ LIVE_USERNAME : string
+
+ source:
+ LIVE_SOURCE : boolean
+ LIVE_SOURCE_IMAGES : list
+
+folder_of_files:
+ chroot_local-hooks
+"""
+
class LiveHelperConfiguration(object):
"""
Represents a configuration for a Debian Live system.
@@ -16,8 +104,7 @@
self._load_observers = []
self.first_load = True
- yaml_filename = join(dirname(__file__), 'spec.yaml')
- self.spec = yaml.load(file(yaml_filename).read())
+ self.spec = yaml.load(spec_str)
if confdir is None:
self.new()
Deleted: dists/trunk/live-magic/livemagic/model/spec.yaml
===================================================================
--- dists/trunk/live-magic/livemagic/model/spec.yaml 2007-08-17 14:15:57 UTC (rev 2781)
+++ dists/trunk/live-magic/livemagic/model/spec.yaml 2007-08-17 19:18:34 UTC (rev 2782)
@@ -1,85 +0,0 @@
-key_value:
- common:
- LH_APT : string
- LH_APT_FTPPROXY : string
- LH_APT_HTTPPROXY : string
- LH_APT_PDIFFS : boolean
- LH_APT_PIPELINE : int
- LH_APT_RECOMMENDS : boolean
- LH_APT_SECURE : boolean
- LH_BOOTSTRAP : string
- LH_CACHE_INDICES : boolean
- LH_CACHE_PACKAGES : boolean
- LH_CACHE_STAGES : list
- LH_DEBCONF_FRONTEND : string
- LH_DEBCONF_NOWARNINGS : boolean
- LH_DEBCONF_PRIORITY : string
- LH_GENISOIMAGE : string
- LH_INITRAMFS : string
- LH_LOSETUP : string
- LH_MODE : string
- LH_ROOT_COMMAND : string
- LH_TASKSEL : string
- LIVE_ROOT : string
- LIVE_INCLUDES : string
- LIVE_TEMPLATES : string
- LH_BREAKPOINTS : boolean
- LH_DEBUG : boolean
- LH_FORCE : boolean
- LH_QUIET : boolean
- LH_VERBOSE : boolean
-
- bootstrap:
- LIVE_ARCHITECTURE : list
- LIVE_BOOTSTRAP_CONFIG : string
- LIVE_BOOTSTRAP_FLAVOUR : string
- LIVE_BOOTSTRAP_KEYRING : string
- LIVE_DISTRIBUTION : string
- LIVE_MIRROR_BOOTSTRAP : string
- LIVE_MIRROR_BOOTSTRAP_SECURITY : string
- LIVE_MIRROR_BINARY : string
- LIVE_MIRROR_BINARY_SECURITY : string
- LIVE_SECTIONS : list
-
- chroot:
- LIVE_CHROOT_FILESYSTEM : string
- LIVE_UNION_FILESYSTEM : string
- LIVE_HOOKS : list
- LIVE_INTERACTIVE : boolean
- LIVE_KEYRING_PACKAGES : list
- LIVE_LANGUAGE : string
- LIVE_LINUX_FLAVOURS : list
- LIVE_LINUX_PACKAGES : list
- LIVE_PACKAGES : list
- LIVE_PACKAGES_LISTS : string
- LIVE_PRESEED : string
- LIVE_TASKS : list
- LIVE_SECURITY : boolean
- LIVE_SYMLINKS : boolean
- LIVE_SYSVINIT : boolean
-
- binary:
- LIVE_BINARY_IMAGES : list
- LIVE_BINARY_INDICES : boolean
- LIVE_BOOTAPPEND : string
- LIVE_BOOTLOADER : string
- LIVE_DEBIAN_INSTALLER : boolean
- LIVE_ENCRYPTION : string
- LIVE_GRUB_SPLASH : string
- LIVE_HOSTNAME : string
- LIVE_ISO_APPLICATION : string
- LIVE_ISO_PREPARER : string
- LIVE_ISO_PUBLISHER : string
- LIVE_ISO_VOLUME : string
- LIVE_MEMTEST : string
- LIVE_NET_PATH : string
- LIVE_NET_SERVER : string
- LIVE_SYSLINUX_SPLASH : string
- LIVE_USERNAME : string
-
- source:
- LIVE_SOURCE : boolean
- LIVE_SOURCE_IMAGES : list
-
-folder_of_files:
- chroot_local-hooks
More information about the debian-live-changes
mailing list