Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=65fc2c49c6e781e6bdf857e466a8d2b997db948a
commit 65fc2c49c6e781e6bdf857e466a8d2b997db948a Author: James Buren <[email protected]> Date: Sun Aug 19 22:43:05 2012 -0500 systemd-188-1-x86_64 * revive some mount units for now diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 2e75b6f..9a9a875 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -14,11 +14,14 @@ makedepends=('vala' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'intltool' 'gperf' 'go options=('scriptlet' 'force') up2date="Flasttar http://www.freedesktop.org/software/$pkgname"; source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz \ - console.conf 65-permissions.rules blacklist) + console.conf 65-permissions.rules blacklist media.mount var-lock.mount var-run.mount) sha1sums=('1874a67d699ccb605ff23e8d8512eefb10a63882' \ 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \ '439e2be7278ecedb4a4f090241bb484a7a25a9c3' \ - '4657cbad76a3d5c8aade4dba166b3f8704c7b07f') + '4657cbad76a3d5c8aade4dba166b3f8704c7b07f' \ + 'f896279eca1bcd02db36b215470593734fd894ee' \ + 'b784cca7ac15405edc2e5c4c1851d712bb6bcc38' \ + '31b8d2530e0c8a70358ad5a6c7d8a0fbf43d1bca') if Fuse $USE_CRYPTSETUP; then depends=("${depends[@]}" 'cryptsetup-luks') @@ -29,7 +32,7 @@ groups=('base') archs=('i686' 'x86_64' 'arm') #TODO : Remove backup, source rc for SysVinit when all rc scripts used systemd -backup=(etc/{vconsole.conf,systemd/{system.conf,user.conf,logind.conf,journald.conf},machine-id,machine-info,locale.conf,sysconfig/blacklist}) +backup=(etc/{vconsole.conf,systemd/{system.conf,user.conf,logind.conf,journald.conf},machine-id,machine-info,locale.conf,udev/udev.conf,sysconfig/blacklist}) subpkgs=('systemd-sysvinit') subdescs=('systemd System V init tools') @@ -109,6 +112,14 @@ build() Fln /etc/sysconfig/blacklist /etc/modprobe.d/blacklist.conf + # Compatibility units. Look into an upgrade path to remove them after 1.8. + Ffile /lib/systemd/system/media.mount + Ffile /lib/systemd/system/var-run.mount + Ffile /lib/systemd/system/var-lock.mount + Fln ../media.mount /lib/systemd/system/local-fs.target.wants/media.mount + Fln ../var-run.mount /lib/systemd/system/local-fs.target.wants/var-run.mount + Fln ../var-lock.mount /lib/systemd/system/local-fs.target.wants/var-lock.mount + Frm /etc/bash_completion.d } diff --git a/source/base/systemd/media.mount b/source/base/systemd/media.mount new file mode 100644 index 0000000..66a5a5c --- /dev/null +++ b/source/base/systemd/media.mount @@ -0,0 +1,16 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Media Directory +Before=local-fs.target + +[Mount] +What=tmpfs +Where=/media +Type=tmpfs +Options=mode=755,nosuid,nodev,noexec diff --git a/source/base/systemd/var-lock.mount b/source/base/systemd/var-lock.mount new file mode 100644 index 0000000..07277ad --- /dev/null +++ b/source/base/systemd/var-lock.mount @@ -0,0 +1,19 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Lock Directory +Before=local-fs.target +# skip mounting if the directory does not exist or is a symlink +ConditionPathIsDirectory=/var/lock +ConditionPathIsSymbolicLink=!/var/lock + +[Mount] +What=/run/lock +Where=/var/lock +Type=bind +Options=bind diff --git a/source/base/systemd/var-run.mount b/source/base/systemd/var-run.mount new file mode 100644 index 0000000..ab4da42 --- /dev/null +++ b/source/base/systemd/var-run.mount @@ -0,0 +1,19 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Runtime Directory +Before=local-fs.target +# skip mounting if the directory does not exist or is a symlink +ConditionPathIsDirectory=/var/run +ConditionPathIsSymbolicLink=!/var/run + +[Mount] +What=/run +Where=/var/run +Type=bind +Options=bind _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
