Code review comment for lp:~ubuntu-branches/ubuntu/oneiric/mountall/oneiric-201106072111

Revision history for this message
Scott Moser (smoser) wrote :

I've gone through the changes in the submitted branch and done a merge. The
end result is that applying the following patch to trunk would bring in all of
Scott's changes that have not been done.

mounted-run.conf:
  I am not sure how permissions on /run/lock are getting set in oneiric at the
  moment, but my system does have 1777 on it. Perhaps it is handled in /run/lock
  has its own entry in src/fstab, in Scott's version it did not.

src/fstab:
 It would seem to me that the src/fstab changes are sane.
  * my booted oneiric system does not have /lib/init/rw in /proc/mounts, so
    this is probably handled somewhere, but seems like it makes sense to
    remove the src/fstab entry
 * Scott's entry added 'nodev'. It seems reasonable to me.

My suggestion is that Steve or Colin look at this and decide if the delta can
be dropped or not. I'm hoping that my summarizing changes here makes that
easier.

=== modified file 'conf/mounted-run.conf'
--- conf/mounted-run.conf 2011-07-13 23:41:17 +0000
+++ conf/mounted-run.conf 2011-07-22 14:41:44 +0000
@@ -9,13 +9,12 @@
 task

 script
+ mkdir -m 1777 -p "/run/lock"
+
     : > "/run/utmp"
     chmod 664 "/run/utmp"
     chgrp utmp "/run/utmp"

- # compatibility; should go away soon
- [ -d /dev/.initramfs/varrun ] && cp -a /dev/.initramfs/varrun/* /run/ || true
-
     mkdir -p /run/sendsigs.omit.d

     # Background the initial motd seeding

=== modified file 'src/fstab'
--- src/fstab 2011-07-13 14:48:13 +0000
+++ src/fstab 2011-07-22 14:50:39 +0000
@@ -16,7 +16,6 @@
 none /dev devtmpfs,tmpfs mode=0755 0 0
 none /dev/pts devpts noexec,nosuid,gid=tty,mode=0620 0 0
 none /tmp none defaults 0 0
-none /run tmpfs noexec,nosuid,size=10%,mode=0755 0 0
+none /run tmpfs nodev,noexec,nosuid,size=10%,mode=0755 0 0
 none /run/lock tmpfs nodev,noexec,nosuid,size=5242880 0 0
 none /run/shm tmpfs nosuid,nodev 0 0
-none /lib/init/rw tmpfs mode=0755,nosuid,optional 0 0

« Back to merge proposal