On Sat, Apr 16, 2011 at 10:44:36PM +1000, Kel Modderman wrote: > On Sat, 16 Apr 2011 08:46:30 PM Roger Leigh wrote: > > On Sat, Apr 16, 2011 at 12:40:43PM +0200, [email protected] wrote: > > > > On Sat, Apr 16, 2011 at 01:26:37AM +0100, Roger Leigh wrote: > > > >> > Following a few final changes, the attached patch and the files at > > > >> > http://people.debian.org/~rleigh/run/ are a proposal for upload of > > > >> > sysvinit_2.88dsf-13.3 to experimental. > > > >> > > > > >> > Would it be acceptable to make this upload to experimental? If you > > > >> > want to pull the patch into subversion and make a maintainer upload, > > > >> > that would be great. Otherwise, I can NMU it myself if you give the > > > >> > OK for doing that. > > > >> > > > >> Patch actually attached now. > > > > > > > > Updated patch to clean up a cosmetic issue mounting /tmp on a > > > > system with read-only root. That's it from me now, should now > > > > be ready for experimental. > > > > > > > > If you won't have time for this this weekend, could I go ahead and > > > > upload it to experimental? > > > > > > Going to apply the NMU diffs and /run patch tonight. Will be in touch. > > > > Awesome, many thanks! > > Applied revisions r1954:r1958 to the packaging in svn. If it is okay, can you > please sync with svn and proceed with your NMU. Just send any other NMU > changes > our way and I'll try to apply them promptly as possible.
Done. The diff to sync svn with the uploaded NMU is attached. I stupidly didn't sync with svn for the upload, so I uploaded a second time with the svn changes synched, which is why there's a second revision in the attached diff. > As for the /run conversion, on my system there is a chmod call in > mountkernfs.sh > that is failing because / is ro at that moment, even though $rootmode = rw. > > The set -x trace is: > --- > + touch /run/.ramfs > + mkdir --mode=755 /run/lock > + [ yes = no ] > + chmod 1777 /run/lock > + touch /run/lock/.ramfs > + [ -L /tmp ] > + [ rw != rw ] > + [ yes = no ] > + chmod 1777 /tmp > chmod: changing permissions of '/tmp':Read-only file system As mentioned on IRC, this was fixed before upload. Many thanks, Roger -- .''`. Roger Leigh : :' : Debian GNU/Linux http://people.debian.org/~rleigh/ `. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/ `- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
Index: debian/src/initscripts/etc/init.d/mountkernfs.sh
===================================================================
--- debian/src/initscripts/etc/init.d/mountkernfs.sh (revision 1958)
+++ debian/src/initscripts/etc/init.d/mountkernfs.sh (working copy)
@@ -44,13 +44,13 @@
# Mount /run/lock as tmpfs if enabled. This prevents user DoS
# of /run by filling /run/lock at the expense of using an
# additional tmpfs.
+ LOCK_OPT=
+ [ "${LOCK_SIZE:=$TMPFS_SIZE}" ] && LOCK_OPT=",size=$LOCK_SIZE"
+ [ "${LOCK_MODE:=$TMPFS_MODE}" ] && LOCK_OPT="$LOCK_OPT,mode=$LOCK_MODE"
if [ yes = "$RAMLOCK" ] ; then
- LOCK_OPT=
- [ "${LOCK_SIZE:=$TMPFS_SIZE}" ] && LOCK_OPT=",size=$LOCK_SIZE"
- [ "${LOCK_MODE:=$TMPFS_MODE}" ] && LOCK_OPT="$LOCK_OPT,mode=$LOCK_MODE"
domount tmpfs shmfs /run/lock tmpfs "-onodev,noexec,nosuid$LOCK_OPT"
else
- chmod 1777 /run/lock
+ chmod "$LOCK_MODE" /run/lock
fi
touch /run/lock/.ramfs
@@ -72,13 +72,15 @@
fi
# Mount /tmp as tmpfs if enabled.
+ TMP_OPT=
+ [ "${TMP_SIZE:=$TMPFS_SIZE}" ] && TMP_OPT=",size=$TMP_SIZE"
+ [ "${TMP_MODE:=$TMPFS_MODE}" ] && TMP_OPT="$TMP_OPT,mode=$TMP_MODE"
if [ yes = "$RAMTMP" ] ; then
- TMP_OPT=
- [ "${TMP_SIZE:=$TMPFS_SIZE}" ] && TMP_OPT=",size=$TMP_SIZE"
- [ "${TMP_MODE:=$TMPFS_MODE}" ] && TMP_OPT="$TMP_OPT,mode=$TMP_MODE"
domount tmpfs shmfs /tmp tmpfs "-onodev,nosuid$TMP_OPT"
else
- chmod 1777 /tmp
+ if [ rw = "$rootmode" ]; then
+ chmod "$TMP_MODE" /tmp
+ fi
fi
# Make pidfile omit directory for sendsigs
Index: debian/src/initscripts/etc/init.d/mountdevsubfs.sh
===================================================================
--- debian/src/initscripts/etc/init.d/mountdevsubfs.sh (revision 1958)
+++ debian/src/initscripts/etc/init.d/mountdevsubfs.sh (working copy)
@@ -38,13 +38,13 @@
[ -x /sbin/restorecon ] && /sbin/restorecon /run/shm
fi
+ SHM_OPT=
+ [ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT=",size=$SHM_SIZE"
+ [ "${SHM_MODE:=$TMPFS_MODE}" ] && SHM_OPT="$SHM_OPT,mode=$SHM_MODE"
if [ yes = "$RAMSHM" ] ; then
- SHM_OPT=
- [ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT=",size=$SHM_SIZE"
- [ "${SHM_MODE:=$TMPFS_MODE}" ] && SHM_OPT="$SHM_OPT,mode=$SHM_MODE"
domount tmpfs shmfs /run/shm tmpfs "-onosuid,nodev$SHM_OPT"
else
- chmod 1777 /run/shm
+ chmod "$SHM_MODE" /run/shm
fi
#
Index: debian/changelog
===================================================================
--- debian/changelog (revision 1958)
+++ debian/changelog (working copy)
@@ -1,3 +1,18 @@
+sysvinit (2.88dsf-13.4) experimental; urgency=low
+
+ [ Roger Leigh ]
+ * Non-maintainer upload.
+
+ [ Kel Modderman ]
+ * Remove code from /etc/init.d/bootmisc.sh which is not needed with modern
+ kernel which do not support BSD ptys. The udev check is not reliable
+ anymore due to /run/. Thanks Marco d'Itri (Closes: #620784)
+ * Handle user interupt of fsck in etc/init.d/checkfs.sh and
+ init.d/checkroot.sh. Trap SIGINT and handle fsck exit status of 32.
+ (Closes: #608534)
+
+ -- Roger Leigh <[email protected]> Sat, 16 Apr 2011 16:50:51 +0100
+
sysvinit (2.88dsf-13.3) experimental; urgency=low
[ Roger Leigh ]
@@ -119,16 +134,8 @@
Hurd does not currently support tmpfs mounts, but will do in the
future. Use firmlinks in place of bind mounts.
- [ Kel Modderman ]
- * Remove code from /etc/init.d/bootmisc.sh which is not needed with modern
- kernel which do not support BSD ptys. The udev check is not reliable
- anymore due to /run/. Thanks Marco d'Itri (Closes: #620784)
- * Handle user interupt of fsck in etc/init.d/checkfs.sh and
- init.d/checkroot.sh. Trap SIGINT and handle fsck exit status of 32.
- (Closes: #608534)
+ -- Roger Leigh <[email protected]> Sat, 16 Apr 2011 01:17:29 +0100
- -- Kel Modderman <[email protected]> Sat, 16 Apr 2011 20:59:44 +1000
-
sysvinit (2.88dsf-13.2) unstable; urgency=low
* Non-maintainer upload.
signature.asc
Description: Digital signature
_______________________________________________ Pkg-sysvinit-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-sysvinit-devel
