Revision: 7051
http://ipcop.svn.sourceforge.net/ipcop/?rev=7051&view=rev
Author: gespinasse
Date: 2013-05-31 08:53:22 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Fix shm issue on debian v7 (whezzy)
Debian symlink /dev/shm to /run/shm and mount /run/shm
OpenSuse still have /dev/shm
So
- fix chroot etc/mtab so /dev/shm appear mounted
- umount unconditionnaly ${LFS}/dev/shm
Not mouting shm let one util-linux test fail
Modified Paths:
--------------
ipcop/trunk/lfs/stage2
ipcop/trunk/make.sh
Modified: ipcop/trunk/lfs/stage2
===================================================================
--- ipcop/trunk/lfs/stage2 2013-05-27 11:30:10 UTC (rev 7050)
+++ ipcop/trunk/lfs/stage2 2013-05-31 08:53:22 UTC (rev 7051)
@@ -116,7 +116,10 @@
# rootfs line need to be absent or coreutils du/bind-mount-dir-cycle.sh
fail
grep '^\/dev.* / ' /proc/mounts >/etc/mtab
# Remove the duplicate due to the mount --bind
- grep -E '/sys sysfs|/proc proc|/dev/pts|/dev/shm' /proc/mounts | sort
-u >>/etc/mtab
+ # shm could appear on /run/shm like with debian V7 where /dev/shm is
symlinked to /run/shm
+ grep -E '/sys sysfs|/proc proc|/dev/pts|/dev/shm|/run/shm' /proc/mounts
| sort -u >>/etc/mtab
+ # Only have /dev/shm, not /run/shm inside the chroot
+ sed -i 's|/run/shm|/dev/shm|' /etc/mtab
# To silent fsck on util-linux tests
touch /etc/fstab
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2013-05-27 11:30:10 UTC (rev 7050)
+++ ipcop/trunk/make.sh 2013-05-31 08:53:22 UTC (rev 7051)
@@ -749,8 +749,10 @@
# Umount /dev/pts and /dev/shm before /dev
${MOUNT} | grep -q ${LFS}/dev/pts && ${SUDO} ${UMOUNT} ${LFS}/dev/pts
- ${MOUNT} | grep -q ${LFS}/dev/shm && ${SUDO} ${UMOUNT} ${LFS}/dev/shm
+ # Trying to check ${LFS}/dev/shm may find nothing on debian v7 /run/shm
+ ${SUDO} ${UMOUNT} ${LFS}/dev/shm
+
# Now find and unmount any of the bound filesystems we need for the
build
for i in `${MOUNT} | grep ${BASEDIR} | sed 's/^.* on \(.[^ ]*\).*$/\1/'`
do
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
