Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=884382788e026e08ba149ff55e6360b9eca30626
commit 884382788e026e08ba149ff55e6360b9eca30626 Author: Miklos Vajna <vmik...@frugalware.org> Date: Wed Mar 9 13:25:04 2011 +0100 systemd-20-1-i686 - version bump - avoid tmpfs on /media for now till we don't have it on /var/{run,lock}, either - add machine-id bits to scriptlet diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 82b8ccb..78ebd0d 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -7,7 +7,7 @@ USE_TCP=${USE_TCP:-"n"} USE_GUI=${USE_GUI:-"y"} pkgname=systemd -pkgver=19 +pkgver=20 pkgrel=1 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" @@ -17,7 +17,7 @@ options=('scriptlet') up2date="Flasttar http://www.freedesktop.org/software/$pkgname" source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ console.conf prefdm.service) -sha1sums=('8c28ebc774e6f3604513d8abdba36b4b1e5b0fe9' \ +sha1sums=('89ebb9c96e8451b0e52ec0d20291aefd51d85f6f' \ 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \ 'fdb7dc79f5a0d120e722c152f956a841667fe011') @@ -33,7 +33,7 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') #TODO : Remove backup, source rc for SysVinit when all rc scripts used systemd -backup=(etc/{vconsole.conf,systemd/system.conf}) +backup=(etc/{vconsole.conf,systemd/system.conf,machine-id}) if Fuse $USE_GUI; then subpkgs=('systemd-gtk') @@ -111,9 +111,10 @@ build() Frm etc/systemd/system/*.target.wants - #don't have tmpfs on /var/run and /var/lock + #don't have tmpfs on /var/run, /var/lock and /media Frm lib/systemd/system/local-fs.target.wants/var-run.mount Frm lib/systemd/system/local-fs.target.wants/var-lock.mount + Frm lib/systemd/system/local-fs.target.wants/media.mount # support for this is disabled in the kernel Frm /lib/systemd/system/dev-hugepages.automount @@ -154,5 +155,7 @@ build() Fsplit systemd-gtk usr/share/polkit-1/actions/org.freedesktop.systemd1.policy Fsplit systemd-gtk usr/share/man/man1/systemadm.* fi + + touch $Fdestdir/etc/machine-id } diff --git a/source/base/systemd/systemd.install b/source/base/systemd/systemd.install index 08ea3ee..7825c06 100644 --- a/source/base/systemd/systemd.install +++ b/source/base/systemd/systemd.install @@ -21,9 +21,12 @@ post_install() { #now /etc/mtab is a symlink rm /etc/mtab ln -sf /proc/self/mounts /etc/mtab + /bin/systemd-machine-id-setup > /dev/null 2>&1 || : } post_upgrade() { + # can be removed after Frugalware-1.5 + /bin/systemd-machine-id-setup > /dev/null 2>&1 || : #reload systemd /bin/systemctl daemon-reexec } _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git