[Frugalware-git] frugalware-current: systemd-20-2-i686

[Miklos Vajna]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=700d1c4b41ccb4e2baab3666a5f1d5be33c44c9f

commit 700d1c4b41ccb4e2baab3666a5f1d5be33c44c9f
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Wed Mar 30 23:44:56 2011 +0200

systemd-20-2-i686

- generate /etc/locale.conf from /etc/sysconfig/language

diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild
index 698f7e2..d38324e 100644
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@ -8,7 +8,7 @@ USE_GUI=${USE_GUI:-"y"}

pkgname=systemd
pkgver=20
-pkgrel=1
+pkgrel=2
pkgdesc="A System and Service Manager"
url="http://www.freedesktop.org/wiki/Software/systemd"
depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 'sysvinit-tools')
@@ -33,7 +33,7 @@ groups=('base')
archs=('i686' 'x86_64' 'ppc' 'arm')

#TODO : Remove backup, source rc for SysVinit when all rc scripts used systemd
-backup=(etc/{vconsole.conf,systemd/system.conf,machine-id})
+backup=(etc/{vconsole.conf,systemd/system.conf,machine-id,locale.conf})

if Fuse $USE_GUI; then
subpkgs=('systemd-gtk')
@@ -156,6 +156,6 @@ build()
Fsplit systemd-gtk usr/share/man/man1/systemadm.*
fi

-	touch $Fdestdir/etc/machine-id
+	touch $Fdestdir/etc/{machine-id,locale.conf}
}

diff --git a/source/base/systemd/systemd.install b/source/base/systemd/systemd.install
index 7825c06..7e767ca 100644
--- a/source/base/systemd/systemd.install
+++ b/source/base/systemd/systemd.install
@@ -22,11 +22,15 @@ post_install() {
rm /etc/mtab
ln -sf /proc/self/mounts /etc/mtab
/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
+	grep LANG= /etc/sysconfig/language |sed 's/export //' > /etc/locale.conf
}

post_upgrade() {
-	# can be removed after Frugalware-1.5
+	# both can be removed after Frugalware-1.5
/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
+	if [ ! -s /etc/locale.conf -a -n "$LANG" ]; then
+		grep LANG= /etc/sysconfig/language |sed 's/export //' > /etc/locale.conf
+	fi
#reload systemd
/bin/systemctl daemon-reexec
}