commit 3b983a042e308632fcaf007209b0cf9424d85010
Author: Daniel Drake <dsd at laptop.org>
Date: Sun Mar 13 15:53:47 2011 +0000
port to systemd
olpc-configure.service | 14 ++++++++++++++
olpc-utils.spec | 22 ++++++++++++++--------
2 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/olpc-configure.service b/olpc-configure.service
new file mode 100644
index 0000000..7cb03df
--- /dev/null
+++ b/olpc-configure.service
@@ -0,0 +1,14 @@
+# Run olpc-configure early during boot
+
+[Unit]
+Description=OLPC Configuration
+DefaultDependencies=no
+After=sysinit.target local-fs.target
+Before=basic.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/olpc-configure start
+
+[Install]
+WantedBy=basic.target
diff --git a/olpc-utils.spec b/olpc-utils.spec
index 6b1640a..ae84bde 100644
--- a/olpc-utils.spec
+++ b/olpc-utils.spec
@@ -1,22 +1,21 @@
Name: olpc-utils
Version: 1.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: OLPC utilities
URL: http://wiki.laptop.org/go/Olpc-utils
Group: System Environment/Base
License: GPLv2+
Source0: http://dev.laptop.org/pub/source/%{name}-%{version}.tar.bz2
+Source1: olpc-configure.service
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# for new event location
-Conflicts: upstart < 0.6.0
-
# for olpc-dm
BuildRequires: ConsoleKit-devel
Requires: /usr/bin/xauth
# for olpc-configure
Requires: /usr/bin/find
+Requires: systemd-units
# for olpc-test-devkey
#comment out for the moment as olpcupdate isn't in Fedora mainline
@@ -47,20 +46,24 @@ make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}"
%install
rm -rf %{buildroot}
make -f Makefile.build install DESTDIR=%{buildroot}
+rm -f %{buildroot}/etc/init/ttyS0.conf # now provided by systemd
+mv %{buildroot}/etc/rc.d/init.d/olpc-configure %{buildroot}/usr/sbin
%ifarch x86_64
mv %{buildroot}/usr/lib %{buildroot}/usr/lib64
%endif
+install -m 644 -D %{SOURCE1} %{buildroot}/lib/systemd/system/olpc-configure.service
+
%post
if [ $1 -eq 1 ]; then
- /sbin/chkconfig --add olpc-configure
+ /bin/systemctl enable olpc-configure.service
/sbin/chkconfig --add diskspacecheck
/sbin/chkconfig --add diskspacerecover
fi
%preun
if [ $1 = 0 ]; then
- /sbin/chkconfig --del olpc-configure
+ /bin/systemctl disable olpc-configure.service
/sbin/chkconfig --del diskspacecheck
/sbin/chkconfig --del diskspacerecover
fi
@@ -71,6 +74,7 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc COPYING
+%{_sbindir}/olpc-configure
%{_sbindir}/olpc-dm
%{_bindir}/olpc-logbat
%{_bindir}/olpc-session
@@ -79,15 +83,14 @@ rm -rf %{buildroot}
%{_bindir}/olpc-audit
%{_bindir}/olpc-test-devkey
%{_bindir}/olpc-solar-log
+/lib/systemd/system/*
%{_datadir}/olpc-utils
%{_libdir}/pm-utils/sleep.d/00xo
%{_sysconfdir}/profile.d/zzz_olpc.sh
-%{_sysconfdir}/rc.d/init.d/olpc-configure
%{_sysconfdir}/rc.d/init.d/diskspacecheck
%{_sysconfdir}/rc.d/init.d/diskspacerecover
%config(noreplace) %{_sysconfdir}/hal/fdi/information/30-keymap-olpc.fdi
%config(noreplace) %{_sysconfdir}/motd.olpc
-%config(noreplace) %{_sysconfdir}/init/ttyS0.conf
%config(noreplace) %{_sysconfdir}/udev/rules.d/10-olpc-sd.rules
%config(noreplace) %{_sysconfdir}/udev/rules.d/10-olpc-net.rules
%config(noreplace) %{_sysconfdir}/udev/rules.d/20-olpc-rfkill.rules
@@ -98,6 +101,9 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/modprobe.d/olpc-psmouse.conf
%changelog
+* Sun Mar 13 2011 Daniel Drake <dsd at laptop.org> - 1.2.8-2
+- port to systemd
+
* Tue Mar 08 2011 Daniel Drake <dsd at laptop.org> - 1.2.8-1
- update keyboard detection code
- use symlink for X config