[26622] in Source-Commits
/svn/athena r25660 - trunk/debathena/scripts/build-server
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 25 17:20:26 2012
Date: Wed, 25 Jul 2012 17:20:24 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207252120.q6PLKOLc007708@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-07-25 17:20:24 -0400 (Wed, 25 Jul 2012)
New Revision: 25660
Modified:
trunk/debathena/scripts/build-server/make-chroot
Log:
Don't barf if /dev/shm is a symlink
Modified: trunk/debathena/scripts/build-server/make-chroot
===================================================================
--- trunk/debathena/scripts/build-server/make-chroot 2012-07-25 20:47:47 UTC (rev 25659)
+++ trunk/debathena/scripts/build-server/make-chroot 2012-07-25 21:20:24 UTC (rev 25660)
@@ -71,7 +71,10 @@
debootstrap --variant=buildd --include=apt,apt-utils,gnupg,build-essential,fakeroot --arch "$ARCH" "$SUITE" "$TARGET" "$MIRROR"
install -m a=rx,u+w "$DATA/policy-rc.d" "$TARGET/usr/sbin/"
mkdir -p "$TARGET/dev/pts"
-mkdir -p "$TARGET/dev/shm"
+# /dev/shm is a symlink to /run/shm on modern distros
+# So if it's not a symlink, then mkdir (and fail if it's something
+# that's not a symlink or a directory)
+[ -L "$TARGET/dev/shm" ] || mkdir -p "$TARGET/dev/shm"
mkdir -p "$TARGET/afs"
mkdir -p "$TARGET/mit"
TAROPTS="cf"
