← Back to branch summary

~racb/ubuntu/precise/cobbler/858860

« back to all changes in this revision

Viewing changes to web/cobbler_web/templates/filter.tmpl

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Clint Byrum, Robie Basak
  • Date: 2011-11-15 12:35:40 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20111115123540-5g139uuhg7z0hv5d
Tags: 2.2.2-0ubuntu1
https://launchpad.net/bugs/858860
https://launchpad.net/bugs/863738
https://launchpad.net/bugs/858875
https://launchpad.net/bugs/863755
https://launchpad.net/bugs/858883
[Chuck Short]
* New upstream release:
  + Use dh_python2 everywhere.
  + Folded debian/patches/49_ubuntu_add_arm_arch_support.patch
    and debian/patches/56_ubuntu_arm_generate_pxe_files.patch
    into one patch for easier upstreaming.
  + Dropped debian/patches/50_fix_cobbler_timezone.patch:
    Fix upstream.
  + Dropped debian/patches/47_ubuntu_add_oneiric_codename.patch
    in favor of debian/patches/47_ubuntu_add_codenames.patch:
    It adds "precise" and drops unsupported releases as well.
  + Dropped debian/patches/41_update_tree_path_with_arch.patch:
    No longer needed.
  + Dropped debian/patches/55_ubuntu_branding.patch: Will be moved
    to orchestra

 [Clint Byrum]
 * debian/cobbler.postinst: create users.digest mode 0600 so it
   is not world readable. (LP: #858860)
 * debian/control: cobbler needs to depend on python-cobbler
   (LP: #863738)
 * debian/patches/58_fix_egg_cache.patch: Do not point dangerous
   PYTHON_EGG_CACHE at world writable directory. (LP: #858875)
 * debian/cobbler-common.install: remove users.digest as it is
   not required and contains a known password that would leave
   cobblerd vulnerable if started before configuration is done
 * debian/cobbler-web.postinst: fix perms on webui_sessions to
   be more secure (LP: #863755)

 [Robie Basak]
 * Backport safe YAML load from upstream. (LP: #858883)

Show diffs side-by-side

added added

removed removed

Lines of Context:
web/cobbler_web/templates/filter.tmpl
59
59
      <option value="virt_ram">virt ram (MB)</option>
60
60
      <option value="virt_type">virt type</option>
61
61
      <option value="server">server override</option>{% endifequal %}
62
 
      {% ifequal what "system" %}<option value="bonding">bonding</option>
63
 
      <option value="bonding_master">bonding master</option>
 
62
      {% ifequal what "system" %}<option value="interface_type">interface type</option>
 
63
      <option value="interface_master">interface master</option>
64
64
      <option value="bonding_opts">bonding opts</option>
 
65
      <option value="bridge_opts">bridge opts</option>
65
66
      <option value="comment">comment</option>
66
67
      <option value="dhcp_tag">dhcp tag</option>
67
68
      <option value="distro">distro</option>
90
91
      <option value="redhat_management_server">red hat management server</option>
91
92
      <option value="repos">repos</option>
92
93
      <option value="server">server override</option>
93
 
      <option value="subnet">subnet</option>
 
94
      <option value="netmask">netmask</option>
94
95
      <option value="static">static</option>
 
96
      <option value="status">status</option>
 
97
      <option value="management">management</option>
95
98
      <option value="static_routes">static_routes</option>
96
99
      <option value="fetchable_files">fetchable files</option>
97
100
      <option value="template_files">template files</option>