~ubuntu-branches/ubuntu/oneiric/netbase/oneiric

Viewing all changes in revision 25.

  • Committer: Benjamin Drung
  • Date: 2010-12-14 16:28:33 UTC
  • mfrom: (24.1.2 natty)
  • Revision ID: bdrung@ubuntu.com-20101214162833-vilz11fd4o5yt7iu
Tags: 4.44ubuntu1
* Merge from debian unstable (LP: #681012), 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
* etc-services: added 5666 (nrpe/tcp), mysql-proxy (6446).
  (Closes: #604830)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: