packages: util-linux/util-linux.spec, util-linux/blockdev.upstart (NEW) - a...

[glen]

Author: glen                         Date: Fri Sep  2 06:33:01 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add blockdev upstart

---- Files affected:
packages/util-linux:
   util-linux.spec (1.315 -> 1.316) , blockdev.upstart (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/util-linux/util-linux.spec
diff -u packages/util-linux/util-linux.spec:1.315 packages/util-linux/util-linux.spec:1.316
--- packages/util-linux/util-linux.spec:1.315	Wed Aug 31 22:06:15 2011
+++ packages/util-linux/util-linux.spec	Fri Sep  2 08:32:55 2011
@@ -41,6 +41,7 @@
 Source2:	login.pamd
 Source3:	%{name}-blockdev.init
 Source4:	%{name}-blockdev.sysconfig
+Source5:	blockdev.upstart
 Patch1:		%{name}-ng-union-mount.patch
 Patch2:		%{name}-ctrlaltdel-man.patch
 Patch3:		%{name}-fdformat-ide.patch
@@ -707,7 +708,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security} \
+install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,init,security} \
 	$RPM_BUILD_ROOT{/%{_lib},/var/{lock,lib/libuuid}}
 %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
 
@@ -720,9 +721,10 @@
 mv $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
 %endif
 
-cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
-cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/init/blockdev.conf
 
 :> $RPM_BUILD_ROOT/etc/security/blacklist.login
 :> $RPM_BUILD_ROOT/var/lock/wtmpxlock
@@ -1217,6 +1219,7 @@
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/blockdev
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/blockdev
+%config(noreplace) %verify(not md5 mtime size) /etc/init/blockdev.conf
 %attr(755,root,root) /sbin/blockdev
 %{_mandir}/man8/blockdev.8*
 %lang(ja) %{_mandir}/ja/man8/blockdev.8*
@@ -1426,6 +1429,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.316  2011/09/02 06:32:55  glen
+- add blockdev upstart
+
 Revision 1.315  2011/08/31 20:06:15  arekm
 - rel 4; don't include mountpoint (SysVinit contains it)
 

================================================================
Index: packages/util-linux/blockdev.upstart
diff -u /dev/null packages/util-linux/blockdev.upstart:1.1
--- /dev/null	Fri Sep  2 08:33:01 2011
+++ packages/util-linux/blockdev.upstart	Fri Sep  2 08:32:55 2011
@@ -0,0 +1,20 @@
+description	"This shell script takes care of starting and stopping blockdev."
+
+start on pld.sysinit-done
+stop on pld.shutdown-started
+
+console output
+
+pre-start script
+	# test that we have any blockdevs
+
+	. /etc/sysconfig/blockdev
+	blockdevs=$(awk -F= '!/^#/ && !/^$/ {if ($2) print $1}' /etc/sysconfig/blockdev)
+	test -n "$blockdevs"
+end script
+
+script
+set -x
+	export USE_UPSTART=no
+	exec /etc/rc.d/init.d/blockdev start
+end script
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux.spec?r1=1.315&r2=1.316&f=u