Merge lp://qastaging/~jibel/lupin/lp-863053 into lp://qastaging/lupin
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~jibel/lupin/lp-863053 |
| Merge into: | lp://qastaging/lupin |
| Diff against target: |
1987 lines (+1814/-0) (has conflicts) 30 files modified
.bzr-builddeb/default.conf (+2/-0) Makefile (+2/-0) casper/hooks/lupin_casper (+19/-0) casper/scripts/casper-bottom/05mountpoints_lupin (+24/-0) casper/scripts/casper-bottom/10custom_installation (+28/-0) casper/scripts/casper-bottom/10ntfs_3g (+23/-0) casper/scripts/casper-premount/20iso_scan (+46/-0) casper/scripts/casper-premount/30custom_installation (+100/-0) casper/scripts/lupin-helpers (+83/-0) debian/changelog (+421/-0) debian/compat (+1/-0) debian/control (+27/-0) debian/copyright (+22/-0) debian/lupin-casper.install (+2/-0) debian/lupin-support.install (+9/-0) debian/lupin-support.mounthost.init (+104/-0) debian/lupin-support.postinst (+28/-0) debian/lupin-support.postrm (+25/-0) debian/lupin-support.preinst (+8/-0) debian/rules (+3/-0) grub-install/Makefile (+9/-0) grub-install/grub-install (+31/-0) grub-install/grub-mkimage (+193/-0) grub-install/grub-probe (+56/-0) grub-install/newns.c (+29/-0) grub.d/10_lupin (+220/-0) hooks/lupin_setup (+7/-0) locale/hooks/root_locale (+47/-0) locale/scripts/local-premount/root_locale (+18/-0) scripts/local-bottom/lupin_setup (+227/-0) Conflict adding file Makefile. Moved existing file to Makefile.moved. Conflict adding file casper. Moved existing file to casper.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file grub-install. Moved existing file to grub-install.moved. Conflict adding file grub.d. Moved existing file to grub.d.moved. Conflict adding file hooks. Moved existing file to hooks.moved. Conflict adding file locale. Moved existing file to locale.moved. Conflict adding file scripts. Moved existing file to scripts.moved. |
| To merge this branch: | bzr merge lp://qastaging/~jibel/lupin/lp-863053 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Installer Team | Pending | ||
|
Review via email:
|
|||
Unmerged revisions
- 45. By Jean-Baptiste Lallement
-
Fixed notification copy when language is non-english
- 44. By Evan
-
* Fix a typo that was preventing the timezone from getting set in Wubi
disk image installs (LP: #855287).
* Provide a warning that the desktop is not localized and that
Language Support needs to be run, for Wubi disk image installs in
languages other than English (LP: #855295). - 43. By Evan
-
Provide the Wubi system with swap space when using a disk image.
- 42. By Evan
-
Don't try to bind mount /root/host, as it's already done.
- 41. By Evan
-
Better error handling in grub-mkimage wrapper.
- 40. By Evan
-
Add missing configfile module to wubildr.
- 39. By Evan
-
Pipe preseed file from the correct location.
- 38. By Evan
-
Add necessary modules for disk image first boot.
- 37. By Evan
-
* Add a plymouth message.
* Properly use the noninteractive frontend.
* Bind-mount /host for update-grub.
* Add hostname.
* Match addition of wubildr-disk.cfg disk install grub configuration
from Wubi. - 36. By Evan
-
Support setting up Wubi from the initramfs in disk image installs.
