-
Committer:
Bazaar Package Importer
-
Author(s):
Lorenzo De Liso
-
Date:
2010-11-08 12:25:31 UTC
-
mfrom:
(1.1.11 sid)
-
Revision ID:
james.westby@ubuntu.com-20101108122531-rmi2wpcqab27f2nq
Tags: 4.43ubuntu1
* 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