lp:~ubuntu-branches/ubuntu/precise/cobbler/precise-201110250011
- Get this branch:
- bzr branch lp:~ubuntu-branches/ubuntu/precise/cobbler/precise-201110250011
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 18412 lines (+146/-17324) (has conflicts)70 files modified.pc/05_cobbler_fix_reposync_permissions.patch/cobbler/action_reposync.py (+0/-568)
.pc/12_fix_dhcp_restart.patch/cobbler/modules/sync_post_restart_services.py (+0/-66)
.pc/21_cobbler_use_netboot.patch/cobbler/modules/manage_import_debian_ubuntu.py (+0/-777)
.pc/33_authn_configfile.patch/config/modules.conf (+0/-86)
.pc/34_fix_apache_wont_start.patch/config/cobbler_web.conf (+0/-14)
.pc/39_cw_remove_vhost.patch/config/cobbler_web.conf (+0/-14)
.pc/40_ubuntu_bind9_management.patch/cobbler/action_check.py (+0/-482)
.pc/40_ubuntu_bind9_management.patch/cobbler/modules/manage_bind.py (+0/-332)
.pc/40_ubuntu_bind9_management.patch/cobbler/modules/sync_post_restart_services.py (+0/-66)
.pc/40_ubuntu_bind9_management.patch/templates/etc/named.template (+0/-31)
.pc/41_update_tree_path_with_arch.patch/cobbler/modules/manage_import_debian_ubuntu.py (+0/-777)
.pc/42_fix_repomirror_create_sync.patch/cobbler/action_reposync.py (+0/-568)
.pc/42_fix_repomirror_create_sync.patch/cobbler/codes.py (+0/-98)
.pc/42_fix_repomirror_create_sync.patch/cobbler/modules/manage_import_debian_ubuntu.py (+0/-779)
.pc/43_fix_reposync_env_variable.patch/cobbler/action_reposync.py (+0/-572)
.pc/45_add_gpxe_support.patch/cobbler/action_check.py (+0/-482)
.pc/45_add_gpxe_support.patch/cobbler/action_litesync.py (+0/-167)
.pc/45_add_gpxe_support.patch/cobbler/modules/manage_in_tftpd.py (+0/-189)
.pc/45_add_gpxe_support.patch/cobbler/modules/manage_isc.py (+0/-201)
.pc/45_add_gpxe_support.patch/cobbler/pxegen.py (+0/-837)
.pc/45_add_gpxe_support.patch/config/settings (+0/-370)
.pc/46_valid_hostname_for_dns.patch/cobbler/modules/manage_isc.py (+0/-201)
.pc/47_ubuntu_add_oneiric_codename.patch/cobbler/codes.py (+0/-98)
.pc/49_ubuntu_add_arm_arch_support.patch/cobbler/action_import.py (+0/-1332)
.pc/49_ubuntu_add_arm_arch_support.patch/cobbler/item_distro.py (+0/-245)
.pc/49_ubuntu_add_arm_arch_support.patch/cobbler/item_image.py (+0/-197)
.pc/49_ubuntu_add_arm_arch_support.patch/cobbler/item_repo.py (+0/-198)
.pc/49_ubuntu_add_arm_arch_support.patch/cobbler/utils.py (+0/-2074)
.pc/49_ubuntu_add_arm_arch_support.patch/web/cobbler_web/templates/import.tmpl (+0/-46)
.pc/50_fix_cobbler_timezone.patch/web/settings.py (+0/-69)
.pc/51_koan_grub2_instead_of_grubby.patch/koan/app.py (+0/-1689)
.pc/52_ubuntu_default_config.patch/config/settings (+0/-374)
.pc/53_sample_preseed_kopts_postinst.patch/kickstarts/sample.seed (+0/-96)
.pc/54_koan_fix_tree_when_ksmeta.patch/koan/app.py (+0/-1741)
.pc/55_ubuntu_branding.patch/web/cobbler_web/templates/login.tmpl (+0/-28)
.pc/55_ubuntu_branding.patch/web/cobbler_web/templates/master.tmpl (+0/-65)
.pc/55_ubuntu_branding.patch/web/content/style.css (+0/-156)
.pc/56_ubuntu_arm_generate_pxe_files.patch/cobbler/pxegen.py (+0/-868)
.pc/57_ubuntu_dnsmasq_domain.patch/templates/etc/dnsmasq.template (+0/-20)
.pc/applied-patches (+0/-23)
cobbler/action_check.py (+1/-4)
cobbler/action_import.py (+2/-2)
cobbler/action_litesync.py (+1/-4)
cobbler/action_reposync.py (+2/-11)
cobbler/codes.py (+3/-3)
cobbler/item_distro.py (+1/-1)
cobbler/item_image.py (+1/-1)
cobbler/item_repo.py (+1/-1)
cobbler/modules/manage_bind.py (+3/-3)
cobbler/modules/manage_import_debian_ubuntu.py (+15/-68)
cobbler/modules/manage_in_tftpd.py (+3/-3)
cobbler/modules/manage_isc.py (+2/-2)
cobbler/modules/sync_post_restart_services.py (+2/-2)
cobbler/pxegen.py (+10/-49)
cobbler/utils.py (+2/-2)
config/cobbler_web.conf (+5/-1)
config/modules.conf (+1/-1)
config/settings (+5/-12)
kickstarts/sample.seed (+0/-2)
koan/app.py (+53/-107)
templates/etc/dnsmasq.template (+0/-1)
templates/etc/named.template (+19/-2)
templates/pxe/gpxemenu.template (+0/-2)
templates/pxe/pxeprofile_arm.template (+0/-5)
templates/pxe/pxesystem_arm.template (+0/-7)
web/cobbler_web/templates/import.tmpl (+0/-1)
web/cobbler_web/templates/login.tmpl (+1/-2)
web/cobbler_web/templates/master.tmpl (+0/-1)
web/content/style.css (+12/-27)
web/settings.py (+1/-1)
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 51. By Andres Rodriguez
-
* debian/patches:
- 42_fix_repomirror_ create_ sync.patch: Updated to correctly create the
mirror. (LP: #872926)
* debian/cobbler- web.postrm: Remove symlinks that were created on
postinst. (LP: #872892) - 50. By Andres Rodriguez
-
* debian/
cobbler- ubuntu- import:
- Check update pockets for releases on download and update check.
(LP: #850880 )
- Allow '-u' to upgrade existing profiles to a newer version of an ISO.
(LP: #850886)
- '-v' to allow debug msgs. - 47. By Andres Rodriguez
-
debian/
cobbler- common. install: Install missing pxeprofile_ arm.template
and pxesystem_arm.template (LP: #844982). - 46. By Andres Rodriguez
-
debian/
cobbler- web.postinst: Correctly handle creation/validation of
links for the Ubuntu font for cobbler-web. (LP: #840188) - 45. By Andres Rodriguez
-
debian/
patches/ 57_ubuntu_ dnsmasq_ domain. patch: Add commented 'domain'
field on dnsmasq template to be later used by orchestra. (LP: #834172) - 44. By Adam Gandelman
-
cobbler-web: Localize use of Ubuntu fonts, add ttf-ubuntu-
font-family
as Depends. (LP #834868) - 43. By Andres Rodriguez
-
debian/
patches/ 52_ubuntu_ default_ config. patch: Update. Add 'orchestra'
to cheetah_import_ whitelist - 42. By Andres Rodriguez
-
* debian/patches:
- 49_ubuntu_add_arm_ arch_support. patch: Updated to allow import of ARM
arch. (LP: #827674)
- 56_ubuntu_arm_generate_ pxe_files. patch: Added. Add templates and
generate files for PXE Menu creation for profile/systems. (LP: #827681)
Additionally make sure hostname is set correctly.
* Add preseed for ARM architectures.
- debian/ubuntu- server- arm.seed: Add
- debian/cobbler. install: Install preseed.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/precise/cobbler