Merge lp:~ubuntu-branches/ubuntu/oneiric/mountall/oneiric-201106072111 into lp:ubuntu/oneiric/mountall

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/mountall now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/mountall/oneiric-201106072111. A merge should be performed if necessary.

[James Westby (james-w)]

Hi,

It looks like Scott had the /run change staged in bzr and the new
upload wasn't started in bzr.

Thanks,

James

[Jamie Strandboge (jdstrand)]

James, are you handling this? It isn't clear from the conversation with yourself what is going on. :)

[James Westby (james-w)]

On Wed, 13 Jul 2011 14:36:01 -0000, Jamie Strandboge <email address hidden> wrote:
> James, are you handling this? It isn't clear from the conversation with yourself what is going on. :)

Nope, the proposal was made by a bot impersonating me (should be fixed
soon). My subsequent comment was just from a quick look to see what was
going on, in the hope it would help someone understand what they were
looking at in this case.

Thanks,

James

[Kees Cook (kees)]

So... can this merge request be rejected, or am I not following?

[James Westby (james-w)]

On Tue, 19 Jul 2011 21:41:31 -0000, Kees Cook <email address hidden> wrote:
> So... can this merge request be rejected, or am I not following?

It can be rejected if we don't want these changes, or if they have been
done in a different manner:

+ * Add /run to /lib/init/fstab; this is mounted with a very strict
+ set of permissions.
+ * Removed /var/run, /var/lock and /lib/init/rw from /lib/init/fstab;
+ these are replaced by symlinks to /run, /run/lock and /run
+ respectively.
+
+ * Renamed /etc/init/mounted-varrun.conf to /etc/init/mounted-run.conf,
+ fixed paths within it and added mkdir command to create /run/lock
+ which is the target of the /var/lock symlink
+ * Drop copy of files from /dev/.initramfs/varrun; this will be handled
+ by initramfs creating that as a symlink to /run in the first place.

Scott made the changes and put them in bzr, indicating that they were
useful, but apparently didn't upload them.

I haven't looked any further than to determine that this was a
legitimate case where a merge proposal such as this should have been
filed by the bot, so I can't say whether we want these changes or not.

Thanks,

James

[Scott Moser (smoser)]

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

[Steve Langasek (vorlon)]

The one change that should be applied is to drop /lib/init/rw from src/fstab. This is now always a symlink to /run, so the fstab entry is superfluous.

=== modified file 'conf/Makefile.am'
--- conf/Makefile.am	2011-03-08 00:52:17 +0000
+++ conf/Makefile.am	2011-06-07 21:16:51 +0000
@@ -8,6 +8,6 @@
 	mountall-shell.conf \
 	mounted-debugfs.conf \
 	mounted-dev.conf \
-	mounted-varrun.conf \
+	mounted-run.conf \
 	mounted-proc.conf \
 	mounted-tmp.conf

=== modified file 'conf/Makefile.in'
--- conf/Makefile.in	2011-03-08 00:52:17 +0000
+++ conf/Makefile.in	2011-06-07 21:16:51 +0000
@@ -278,7 +278,7 @@
 	mountall-shell.conf \
 	mounted-debugfs.conf \
 	mounted-dev.conf \
-	mounted-varrun.conf \
+	mounted-run.conf \
 	mounted-proc.conf \
 	mounted-tmp.conf
 

=== renamed file 'conf/mounted-varrun.conf' => 'conf/mounted-run.conf'
--- conf/mounted-varrun.conf	2010-07-22 15:13:09 +0000
+++ conf/mounted-run.conf	2011-06-07 21:16:51 +0000
@@ -1,24 +1,23 @@
-# mounted-varrun - Populate /var/run filesystem
+# mounted-run - Populate /run filesystem
 #
-# Populates the /var/run filesystem, creating the empty utmp file
-
-description	"Populate /var/run filesystem"
-
-start on mounted MOUNTPOINT=/var/run TYPE=tmpfs
-env MOUNTPOINT=/var/run
+# Populates the /run filesystem, creating the empty utmp file
+
+description	"Populate /run filesystem"
+
+start on mounted MOUNTPOINT=/run TYPE=tmpfs
+env MOUNTPOINT=/run
 
 task
 
 script
+    mkdir -m 1777 -p "${MOUNTPOINT}/lock"
+
     : > "${MOUNTPOINT}/utmp"
     chmod 664 "${MOUNTPOINT}/utmp"
     chgrp utmp "${MOUNTPOINT}/utmp"
 
-    [ -d /dev/.initramfs/varrun ] && cp -a /dev/.initramfs/varrun/* "${MOUNTPOINT}" || true
-
-    mkdir -p /var/run/sendsigs.omit.d
+    mkdir -p "${MOUNTPOINT}/sendsigs.omit.d"
 
     # Background the initial motd seeding
-    [ -d "/etc/update-motd.d" ] && run-parts --lsbsysinit /etc/update-motd.d > /var/run/motd &
-
+    [ -d "/etc/update-motd.d" ] && run-parts --lsbsysinit /etc/update-motd.d > "${MOUNTPOINT}/motd" &
 end script

=== modified file 'configure'
--- configure	2011-04-13 12:59:22 +0000
+++ configure	2011-06-07 21:16:51 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for mountall 2.26.
+# Generated by GNU Autoconf 2.67 for mountall 2.27.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -703,8 +703,8 @@
 # Identity of this package.
 PACKAGE_NAME='mountall'
 PACKAGE_TARNAME='mountall'
-PACKAGE_VERSION='2.26'
-PACKAGE_STRING='mountall 2.26'
+PACKAGE_VERSION='2.27'
+PACKAGE_STRING='mountall 2.27'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1511,7 +1511,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mountall 2.26 to adapt to many kinds of systems.
+\`configure' configures mountall 2.27 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1581,7 +1581,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mountall 2.26:";;
+     short | recursive ) echo "Configuration of mountall 2.27:";;
    esac
   cat <<\_ACEOF
 
@@ -1725,7 +1725,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mountall configure 2.26
+mountall configure 2.27
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2328,7 +2328,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mountall $as_me 2.26, which was
+It was created by mountall $as_me 2.27, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -4476,7 +4476,7 @@
 
 # Define the identity of the package.
  PACKAGE='mountall'
- VERSION='2.26'
+ VERSION='2.27'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18075,7 +18075,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mountall $as_me 2.26, which was
+This file was extended by mountall $as_me 2.27, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18141,7 +18141,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mountall config.status 2.26
+mountall config.status 2.27
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-04-13 12:59:22 +0000
+++ configure.ac	2011-06-07 21:16:51 +0000
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.62)
-AC_INIT([mountall], [2.26], [[e-mail]])
+AC_INIT([mountall], [2.27], [[e-mail]])
 AC_COPYRIGHT([[Copyright © 2010 Canonical Ltd.]])
 AC_CONFIG_SRCDIR([src/mountall.c])
 AC_CONFIG_MACRO_DIR([m4])

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-07 12:16:22 +0000
+++ debian/changelog	2011-06-07 21:16:51 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 mountall (2.26) oneiric; urgency=low
 
   * Correct grammar on user-visible strings
@@ -5,6 +6,24 @@
 
  -- Bryce Harrington <[e-mail]>  Tue, 07 Jun 2011 12:16:22 -0700
 
+=======
+mountall (2.27) UNRELEASED; urgency=low
+
+  * Add /run to /lib/init/fstab; this is mounted with a very strict
+    set of permissions.
+  * Removed /var/run, /var/lock and /lib/init/rw from /lib/init/fstab;
+    these are replaced by symlinks to /run, /run/lock and /run
+    respectively.
+
+  * Renamed /etc/init/mounted-varrun.conf to /etc/init/mounted-run.conf,
+    fixed paths within it and added mkdir command to create /run/lock
+    which is the target of the /var/lock symlink
+  * Drop copy of files from /dev/.initramfs/varrun; this will be handled
+    by initramfs creating that as a symlink to /run in the first place.
+
+ -- Scott James Remnant <[e-mail]>  Tue, 03 May 2011 13:53:45 -0700
+
+>>>>>>> MERGE-SOURCE
 mountall (2.25ubuntu1) natty; urgency=low
 
   * Fixed two errors found while browsing the code: 1) find_mount("/") returns

=== modified file 'debian/control'
--- debian/control	2010-03-31 18:26:18 +0000
+++ debian/control	2011-06-07 21:16:51 +0000
@@ -3,10 +3,11 @@
 Priority: required
 Maintainer: Scott James Remnant <[e-mail]>
 Standards-Version: 3.8.0.0
-Build-Depends: debhelper (>= 7.3.15ubuntu2~boot7), pkg-config (>= 0.22), libnih-dev (>= 1.0.0), libnih-dbus-dev (>= 1.0.0), nih-dbus-tool (>= 1.0.0), libdbus-1-dev (>= 1.2.16), libexpat1-dev (>= 2.0.0), libudev-dev (>= 146), libplymouth-dev (>= 0.8.1-3)
+Build-Depends: debhelper (>= 8.1.0), pkg-config (>= 0.22), libnih-dev (>= 1.0.0), libnih-dbus-dev (>= 1.0.0), nih-dbus-tool (>= 1.0.0), libdbus-1-dev (>= 1.2.16), libexpat1-dev (>= 2.0.0), libudev-dev (>= 146), libplymouth-dev (>= 0.8.1-3)
 
 Package: mountall
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: makedev, udev, plymouth, coreutils (>= 7.1), ${shlibs:Depends}, ${misc:Depends}
 Replaces: upstart (<< 0.6.3-2)
 Breaks: usplash (<< 0.5.47), policycoreutils (<< 2.0.69-2ubuntu4)

=== added file 'debian/maintscript'
--- debian/maintscript	1970-01-01 00:00:00 +0000
+++ debian/maintscript	2011-06-07 21:16:51 +0000
@@ -0,0 +1,1 @@
+mv_conffile /etc/init/mounted-varrun.conf /etc/init/mounted-run.conf

=== modified file 'src/fstab'
--- src/fstab	2009-12-13 20:51:40 +0000
+++ src/fstab	2011-06-07 21:16:51 +0000
@@ -17,6 +17,4 @@
 none            /dev/pts                  devpts          noexec,nosuid,gid=tty,mode=0620   0 0
 none            /dev/shm                  tmpfs           nosuid,nodev                      0 0
 none            /tmp                      none            defaults                          0 0
-none            /var/run                  tmpfs           mode=0755,nosuid,showthrough      0 0
-none            /var/lock                 tmpfs           nodev,noexec,nosuid,showthrough   0 0
-none            /lib/init/rw              tmpfs           mode=0755,nosuid,optional         0 0
+none            /run                      tmpfs           mode=0755,nodev,noexec,nosuid     0 0