Merge lp:~vorlon/upstart/lp.1244763 into lp:upstart

[Steve Langasek]

Straightforward change to fix bug #1244763. Adam will test this on an
initramfsless system to confirm it DTRT.

[Adam Conrad (adconrad)]

Tested on a machine that exhibits the issue, results pre and post-patching:

============ unpatched output ==============
beebe:~$ cat /proc/mounts
rootfs / rootfs rw 0 0
/dev/root / ext4 rw,relatime,data=ordered 0 0
devtmpfs /dev devtmpfs rw,relatime,size=8223712k,nr_inodes=2055928,mode=755 0 0
none /dev/pts devpts rw,nosuid,noexec,relatime,mode=600 0 0
none /proc proc rw,nosuid,nodev,noexec,relatime 0 0
none /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
none /sys/fs/cgroup tmpfs rw,relatime,size=4k,mode=755 0 0
none /sys/fs/fuse/connections fusectl rw,relatime 0 0
none /sys/kernel/debug debugfs rw,relatime 0 0
none /run tmpfs rw,nosuid,noexec,relatime,size=1644764k,mode=755 0 0
none /run/lock tmpfs rw,nosuid,nodev,noexec,relatime,size=5120k 0 0
none /run/shm tmpfs rw,nosuid,nodev,relatime 0 0
none /run/user tmpfs rw,nosuid,nodev,noexec,relatime,size=102400k,mode=755 0 0
systemd /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,name=systemd 0 0

============= patched output ===============
beebe:~$ cat /proc/mounts
rootfs / rootfs rw 0 0
/dev/root / ext4 rw,relatime,data=ordered 0 0
devtmpfs /dev devtmpfs rw,relatime,size=8223712k,nr_inodes=2055928,mode=755 0 0
none /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620 0 0
none /proc proc rw,nosuid,nodev,noexec,relatime 0 0
none /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
none /sys/fs/cgroup tmpfs rw,relatime,size=4k,mode=755 0 0
none /sys/fs/fuse/connections fusectl rw,relatime 0 0
none /sys/kernel/debug debugfs rw,relatime 0 0
none /run tmpfs rw,nosuid,noexec,relatime,size=1644764k,mode=755 0 0
none /run/lock tmpfs rw,nosuid,nodev,noexec,relatime,size=5120k 0 0
none /run/shm tmpfs rw,nosuid,nodev,relatime 0 0
none /run/user tmpfs rw,nosuid,nodev,noexec,relatime,size=102400k,mode=755 0 0
systemd /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,name=systemd 0 0

System seems otherwise fine, no new hiccups in booting, and the only mount that appears different is devpts, for the better.

review: Approve

[Dimitri John Ledkov (xnox)]

lgtm.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-10-23 22:44:54 +0000
+++ ChangeLog	2013-10-25 19:18:39 +0000
@@ -1,3 +1,10 @@
[phone]  Steve Langasek  <[e-mail]>
+
+	* init/main.c, init/system.c, init/system.h: allow mount options
+	  to be passed to system_mount(), and pass the right options when
+	  mounting /dev/pts to match the permissions set by either
+	  initramfs-tools or mountall.  LP: #1244763.
+
 2013-10-23  Dmitrijs Ledkovs  <[e-mail]>
 
  	* extra/upstart-socket-bridge.c: use SOCKET_PATH in our event

=== modified file 'init/main.c'
--- init/main.c	2013-07-31 09:28:48 +0000
+++ init/main.c	2013-10-25 19:18:39 +0000
@@ -280,7 +280,8 @@
 			needs_devtmpfs = 1;
 
 		if (needs_devtmpfs) {
-			if (system_mount ("devtmpfs", "/dev", (MS_NOEXEC | MS_NOSUID)) < 0) {
+			if (system_mount ("devtmpfs", "/dev",
+					  MS_NOEXEC | MS_NOSUID, NULL) < 0) {
 				NihError *err;
 
 				err = nih_error_get ();
@@ -296,7 +297,8 @@
 				nih_error ("%s: %s", _("Cannot create directory"), "/dev/pts");
 		}
 
-		if (system_mount ("devpts", "/dev/pts", (MS_NOEXEC | MS_NOSUID)) < 0) {
+		if (system_mount ("devpts", "/dev/pts", MS_NOEXEC | MS_NOSUID,
+				  "gid=5,mode=0620") < 0) {
 			NihError *err;
 
 			err = nih_error_get ();
@@ -356,7 +358,8 @@
 		 * ourselves. Also mount /dev/pts to allow CONSOLE_LOG
 		 * to function if booted in an initramfs-less environment.
 		 */
-		if (system_mount ("proc", "/proc", (MS_NODEV | MS_NOEXEC | MS_NOSUID)) < 0) {
+		if (system_mount ("proc", "/proc",
+				  MS_NODEV | MS_NOEXEC | MS_NOSUID, NULL) < 0) {
 			NihError *err;
 
 			err = nih_error_get ();
@@ -365,7 +368,8 @@
 			nih_free (err);
 		}
 
-		if (system_mount ("sysfs", "/sys", (MS_NODEV | MS_NOEXEC | MS_NOSUID)) < 0) {
+		if (system_mount ("sysfs", "/sys",
+				  MS_NODEV | MS_NOEXEC | MS_NOSUID, NULL) < 0) {
 			NihError *err;
 
 			err = nih_error_get ();

=== modified file 'init/system.c'
--- init/system.c	2012-08-03 15:47:59 +0000
+++ init/system.c	2013-10-25 19:18:39 +0000
@@ -165,21 +165,20 @@
  * system_mount:
  * @type: filesystem type,
  * @dir: mountpoint,
- * @flags: mount flags.
- *
- * Mount the kernel filesystem @type at @dir with @flags, if not already mounted.  This
- * is used to ensure that the proc and sysfs filesystems are always
- * available.
- *
- * Filesystems are always mounted with the MS_NODEV, MS_NOEXEC and MS_NOSUID
- * mount options, which are sensible for /proc and /sys.
+ * @flags: mount flags,
+ * @options: mount options.
+ *
+ * Mount the kernel filesystem @type at @dir with @flags and mount options
+ * @options, if not already mounted.  This is used to ensure that the proc
+ * and sysfs filesystems are always available.
  *
  * Returns: zero on success, negative value on raised error.
  **/
 int
 system_mount (const char *type,
 	      const char *dir,
-	      unsigned long flags)
+	      unsigned long flags,
+	      const char *options)
 {
 	nih_local char *parent = NULL;
 	char *          ptr;
@@ -208,7 +207,7 @@
 		return 0;
 
 	/* Mount the filesystem */
-	if (mount ("none", dir, type, flags, NULL) < 0)
+	if (mount ("none", dir, type, flags, options) < 0)
 		nih_return_system_error (-1);
 
 	return 0;

=== modified file 'init/system.h'
--- init/system.h	2012-08-03 15:47:59 +0000
+++ init/system.h	2013-10-25 19:18:39 +0000
@@ -36,7 +36,7 @@
 	__attribute__ ((warn_unused_result));
 
 int system_mount         (const char *type, const char *dir,
-			  unsigned long flags)
+			  unsigned long flags, const char *options)
 	__attribute__ ((warn_unused_result));
 
 void system_mknod        (const char *path, mode_t mode, dev_t dev);