lp:~smoser/ubuntu/natty/netbase/lp-681012-sync
- Get this branch:
- bzr branch lp:~smoser/ubuntu/natty/netbase/lp-681012-sync
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 52 lines (+27/-0)2 files modifieddebian/changelog (+24/-0)
etc-services (+3/-0)
Related source package recipes
Related bugs
| Bug #681012: Merge netbase 4.44 from debian sid/Add mysql proxy port (6446) to /etc/services | Undecided | Fix Released |
|
Related blueprints
Branch information
- Owner:
- Scott Moser
- Status:
- Development
Recent revisions
- 25. By Scott Moser
-
* straight merge of debian unstable (LP: #681012)
* etc-services: added 5666 (nrpe/tcp), mysql-proxy (6446).
(Closes: #604830) - 24. By Lorenzo De Liso
-
* Merge from debian unstable (LP: #671193), remaining changes:
- debian/netbase. init:
+ silence ifup/ifdown if VERBOSE == no
+ silence debuging output if VERBOSE == no
+ Temporarily increase usplash timeout to 120 seconds
to cope with slop DHCP server responses. LP: #21617
+ Replace the "start" command with a call to upstart-job
- debian/control: Depend on upstart-job
- debian/netbase. postinst:
+ Remove old start symlinks on upgrade
+ Only install symlinks for runlevel 0 and 6
* Dropped changes:
- Don't deconfigure network interfaces if /etc/iscsi/iscsi.initramfs
exists, since that probably indicates root on iSCSI (LP: #447377): fixed
in debian - 23. By Colin Watson
-
* debian/
netbase. init:
- Don't deconfigure network interfaces if /etc/iscsi/iscsi.initramfs
exists, since that probably indicates root on iSCSI (LP: #447377). - 22. By Scott James Remnant (Canonical)
-
FFE LP: #427356.
* debian/
netbase. init:
- Replace the "start" command with a call to upstart-job
* debian/control:
- Depend on upstart-job
* debian/netbase. postinst:
- Remove old start symlinks on upgrade
- Only install symlinks for runlevel 0 and 6 - 21. By Muharem Hrnjadovic
-
* Merge from debian unstable (LP: #391214), remaining changes:
- debian/netbase. init: silence ifup/ifdown if VERBOSE == no
- debian/netbase. init: silence debuging output if VERBOSE == no
- debian/netbase. init: Temporarily increase usplash timeout to 120 seconds
to cope with slop DHCP server responses. LP: #21617 - 19. By Scott James Remnant (Canonical)
-
* Merge from debian unstable, remaining changes:
- introduce flag file for indicating the network has been
configured. This is needed so that ifupdown udev rules does not 'ifup'
the interface too early. Related to LP: #44194
- debian/netbase. init: silence ifup/ifdown if VERBOSE == no
- debian/netbase. init: silence debuging output if VERBOSE == no
- debian/netbase. init: Temporarily increase usplash timeout to 120 seconds
to cope with slop DHCP server responses. LP: #21617 - 18. By Reinhard Tartler
-
* Merge from debian unstable, remaining changes:
- introduce flag file for indicating the network has been
configured. This is needed so that ifupdown udev rules does not 'ifup'
the interface too early. Related to LP: 44194
- debian/netbase. init: silence ifup/ifdown if VERBOSE == no
- debian/netbase. init: silence debuging output if VERBOSE == no
- debian/netbase. init: Temporarily increase usplash timeout to 120 seconds
to cope with slop DHCP server responses. (LP: 21617)
* netbase.preinst: removed. It would only affect pre-dapper upgrades which we don't
support anyways.
* netbase.postinst: dropped all ubuntu modifications. It would only
affect pre-dapper upgrades which we don't support anyways.
* debian/control: drop dependency on update-inetd. - 17. By Reinhard Tartler
-
introduce flag file for indicating the network has been
configured. This is needed so that ifupdown udev rules does not 'ifup'
the interface too early. Related to LP: #44194
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/natty/netbase
