lp:~gandelman-a/ubuntu/oneiric/cobbler/lp850892

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/oneiric/cobbler at revision 48

Ubuntu branches: Pending requested 2011-09-15

Diff: 98 lines (+46/-7)

2 files modified

debian/changelog (+8/-0)
debian/cobbler-ubuntu-import (+38/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #850892: orchestra-import-isos does not update

Undecided

Fix Released

Link a bug report

Related blueprints

50. By Adam Gandelman on 2011-09-16

Whitepace cleanup

49. By Adam Gandelman on 2011-09-16

Shell cleanup as per smoser's comments

48. By Adam Gandelman on 2011-09-15

debian/cobbler-ubuntu-import: Add --check-update and --remove
functionality. This should help orchestra-import-isos keep local
ISO caches up-to-date. (LP: #850892)

47. By Andres Rodriguez on 2011-09-08

debian/cobbler-common.install: Install missing pxeprofile_arm.template
and pxesystem_arm.template (LP: #844982).

46. By Andres Rodriguez on 2011-09-06

debian/cobbler-web.postinst: Correctly handle creation/validation of
links for the Ubuntu font for cobbler-web. (LP: #840188)

45. By Andres Rodriguez on 2011-09-01

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 on 2011-08-26

cobbler-web: Localize use of Ubuntu fonts, add ttf-ubuntu-font-family
as Depends. (LP #834868)

43. By Andres Rodriguez on 2011-08-23

debian/patches/52_ubuntu_default_config.patch: Update. Add 'orchestra'
to cheetah_import_whitelist

42. By Andres Rodriguez on 2011-08-17

* 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.

41. By Dustin Kirkland  on 2011-08-11

* debian/cobbler-ubuntu-import:
  - move the loop_mount logic over from orchestra-import-isos (which now
    uses cobbler-ubuntu-import)