[Merge] lp:~jamesodhunt/upstart/bug-980917 into lp:upstart

[James Hunt]

James Hunt has proposed merging lp:~jamesodhunt/upstart/bug-980917 into lp:upstart.

Requested reviews:
  Upstart Reviewers (upstart-reviewers)

For more details, see:
https://code.launchpad.net/~jamesodhunt/upstart/bug-980917/+merge/117863

* init/main.c:main(): Create /dev/ptmx and mount /dev and /dev/pts to
  handle scenario where Upstart boots in a non-initramfs environment
  (LP: #980917).
* init/system.c: system_mount(): Add flags parameter (to allow /dev and
  /dev/pts to be mounted without MS_NODEV).
* init/system.h: system_mount(): Updated prototype.

To test this, you will have to modify the boot command line via grub/uBoot. Specifically, ensure that:

- *NO* 'initrd=' entry is specified.
- A 'root=' boot entry is specified with the actual device, *NOT* a UUID.
- A 'rootfstype=' boot entry is specified if the FS type is not ext2/3.

For example, on a system with this version of Upstart booted:

$ cat /proc/cmdline
BOOT_IMAGE=/boot/vmlinuz-3.2.0-18-generic ro root=/dev/sda1 rootfstype=ext4
$ 

-- 
https://code.launchpad.net/~jamesodhunt/upstart/bug-980917/+merge/117863
Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/bug-980917 into lp:upstart.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 3329 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20120802/ab8eb528/attachment.diff>