-
Committer:
Bazaar Package Importer
-
Author(s):
Scott James Remnant
-
Date:
2008-11-05 07:29:32 UTC
-
mfrom:
(2.1.2 sid)
-
Revision ID:
james.westby@ubuntu.com-20081105072932-ts0xpioogotu23vh
Tags: 2.86.ds1-61ubuntu1
* Merge from debian unstable, remaining changes:
- Support Cell processor:
+ debian/initscripts/postinst: Create spu system group and /spu mount
point if we are running on a Cell processor.
+ debian/initscripts/etc/init.d/mountkernfs.sh: Mount spufs if Cell
processor is detected.
+ debian/initscripts/lib/init/mount-functions.sh: Modprobe spufs
if not available.
+ debian/control: Add initscripts dependency 'passwd' for groupadd.
(Forwarded to Debian #483399)
- Use tmpfs mounts for /var/lock and /var/run:
+ debian/initscripts/share/default.rcS: Enable RAMRUN and RAMLOCK by
default.
+ debian/initscripts/postinst: Enable RAMRUN and RAMLOCK in
/etc/default/rcS on upgrades. This needs to be kept until the next
LTS.
+ debian/initscripts/etc/init.d/mountkernfs.sh: Propagate files from the
initramfs to our new /var/run, so that we can populate
/var/run/sendsigs.omit from initramfs.
- Different boot order: (to be checked if still required):
+ debian/initscripts/postinst: Change the rcS priorities of a bunch of
init scripts.
+ Disable bootlogd, since it is handled by upstart in Ubuntu.
+ But make it support the "status" action.
- Usplash fsck integration:
+ debian/initscripts/lib/init/usplash-fsck-functions.sh: Functions for
reporting fsck progress in usplash.
+ debian/initscripts/etc/init.d/check{root,fs}.sh: Include
usplash-fsck-functions.sh and use it if usplash is running.
- debian/initscripts/etc/init.d/sendsigs: Always mount devpts, and do not
touch /dev/ptmx (which is already managed by udev).
- debian/initscripts/etc/init.d/checkroot.sh: If ACPI is available, load
the ac module before checking the root filesystem, so that fsck can
skip the check when running on battery. (LP #89752, forwarded to
Debian #483394)
- debian/initscripts/etc/init.d/mountkernfs.sh: Drop mounting of usbdevfs
(/proc/bus/usb), it was deprecated long ago. (Forwarded to Debian #483392)
- debian/patches/91_sulogin_lockedpw.dpatch: Disable "root account is
locked" warning, since this is the default in Ubuntu. Document this in
sulogin.8.
- debian/patches/94_service.dpatch: add "service" shell script and manpage
- debian/initscripts/etc/init.d/mountall.sh: Set $LANG from
/etc/default/locale, so that ntfs-3g and friends can get correct file
name encodings. (LP #132357, forwarded to Debian #483396)
- debian/initscripts/etc/init.d/umountroot: mkdir a few essential
directories (/proc, /sys, /var/{run,lock}), right before mounting root
r/o. It is a convenient (and one of the very few possible) place to
ensure that the next boot will succeed. (Forwarded to Debian #483393)
- debian/initscripts/preinst: Fix typo in eliminate_conffile() which broke
the entire function. (Forwarded to Debian #483391)
- debian/control: Do not make sysvinit essential, so that we can replace
it with upstart.
- debian/sysv-rc/sbin/update-rc.d: Support 'multiuser' argument for
backwards compatibility. This is deprecated now, since Debian adopted a
different strategy, and for getting in sync with Debian the runlevels
should be specified manually.
- debian/control: Previous name for sysvinit-utils was 'sysvutils' in
Ubuntu, so Conflict/Replace/Provide it. Also create a dummy sysvutils
package, since Hardy has reverse versioned dependencies to it. This
needs to be kept until after the next LTS.
- debian/initscripts/{pre,postinst}: waitnfs.sh -> mountnfs.sh renaming
transition. This needs to be kept until after the next LTS.
- debian/initscripts/preinst: Install new version of /etc/init.d/rc.local
if unmodified.
- debian/initscripts/etc/init.d/umountfs: Don't unmount filesystems
that precede root or use force for some mountpoints.
- debian/sysv-rc/etc/init.d/rc: fix computing of runlevel by allowing
A-Z in init script names.