diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-10-04 04:20:57 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-10-04 04:20:57 +0000 |
| commit | bc72d8bf4e11e19c490d8e684e69686746ef6cc8 (patch) | |
| tree | 9898be3a9d7d5c9fa2324d71bec71109c7d353e8 | |
| parent | symlink /var/run to /run and /var/lock to /run/lock (diff) | |
| download | baselayout-bc72d8bf4e11e19c490d8e684e69686746ef6cc8.tar.gz baselayout-bc72d8bf4e11e19c490d8e684e69686746ef6cc8.tar.bz2 baselayout-bc72d8bf4e11e19c490d8e684e69686746ef6cc8.zip | |
restore /var/lock and /var/run for BSD, and move /run and /run/lock into Linux-specific logic
svn path=/trunk/; revision=3201
| -rw-r--r-- | Makefile | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -24,6 +24,9 @@ OS=BSD endif endif +KEEP_DIRS-BSD += \ + /var/lock \ + /var/run KEEP_DIRS-Linux += \ /dev \ /run \ @@ -56,13 +59,23 @@ install: $(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout cp -pPR share.$(OS)/* $(DESTDIR)/usr/share/baselayout/ -layout: +layout-dirs: # Create base filesytem layout for x in $(KEEP_DIRS) ; do \ test -e $(DESTDIR)$$x/.keep && continue ; \ $(INSTALL_DIR) $(DESTDIR)$$x || exit $$? ; \ touch $(DESTDIR)$$x/.keep || echo "ignoring touch failure; mounted fs?" ; \ done + +layout-BSD: layout-dirs + -chgrp uucp $(DESTDIR)/var/lock + install -m 0775 -d $(DESTDIR)/var/lock + +layout-Linux: layout-dirs + ln -snf /run $(DESTDIR)/var/run + ln -snf /run/lock $(DESTDIR)/var/lock + +layout: layout-dirs layout-$(OS) # Special dirs install -m 0700 -d $(DESTDIR)/root touch $(DESTDIR)/root/.keep @@ -70,8 +83,6 @@ layout: touch $(DESTDIR)/var/tmp/.keep install -m 1777 -d $(DESTDIR)/tmp touch $(DESTDIR)/tmp/.keep - ln -snf /run $(DESTDIR)/var/run - ln -snf /run/lock $(DESTDIR)/var/lock # FHS compatibility symlinks stuff ln -snf /var/tmp $(DESTDIR)/usr/tmp |