revised layout

diff --git a/NodeManager.spec b/NodeManager.spec
index ca181e7..978280d 100644 (file)
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@ -67,10 +67,11 @@ local operations on slices.
 rm -rf $RPM_BUILD_ROOT
 %{__make} %{?_smp_mflags} install DESTDIR="$RPM_BUILD_ROOT"
 
-install -D -m 755 conf_files.init $RPM_BUILD_ROOT/%{_initrddir}/conf_files
-install -D -m 755 fuse-pl.init $RPM_BUILD_ROOT/%{_initrddir}/fuse-pl
-install -D -m 755 nm.init $RPM_BUILD_ROOT/%{_initrddir}/nm
-install -D -m 644 nm.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/nm
+mkdir -p $RPM_BUILD_ROOT/%{_initrddir}/
+rsync -av initscripts/ $RPM_BUILD_ROOT/%{_initrddir}/
+chmod 755 $RPM_BUILD_ROOT/%{_initrddir}/*
+
+install -D -m 644 logrotate/nm $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/nm
 
 %post
 chkconfig --add conf_files
@@ -103,9 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_datadir}/NodeManager/
 %{_bindir}/forward_api_calls
-%{_initrddir}/nm
-%{_initrddir}/conf_files
-%{_initrddir}/fuse-pl
+%{_initrddir}/
 %{_sysconfdir}/logrotate.d/nm
 
 %changelog

diff --git a/conf_files.init b/initscripts/conf_files
similarity index 96%
rename from conf_files.init
rename to initscripts/conf_files
index 5f6e7aa..1b85817 100644 (file)
--- a/conf_files.init
+++ b/initscripts/conf_files
@@ -1,5 +1,8 @@
 #!/bin/bash
 #
+# $Id$
+# $URL$
+#
 # conf_files       Updates node configuration files at startup
 #
 # chkconfig: 3 20 80

diff --git a/fuse-pl.init b/initscripts/fuse-pl
similarity index 99%
rename from fuse-pl.init
rename to initscripts/fuse-pl
index 2f0eebe..4c170e3 100644 (file)
--- a/fuse-pl.init
+++ b/initscripts/fuse-pl
@@ -1,5 +1,8 @@
 #!/bin/bash
 #
+# $Id$
+# $URL$
+#
 # fuse-pl      Start FUSE support on PlanetLab
 #
 # chkconfig: 3 87 27

diff --git a/nm.init b/initscripts/nm
similarity index 98%
rename from nm.init
rename to initscripts/nm
index eda0f11..61b7254 100755 (executable)
--- a/nm.init
+++ b/initscripts/nm
@@ -1,5 +1,8 @@
 #!/bin/bash
 #
+# $Id$
+# $URL$
+#
 # nm       Starts and stops Node Manager daemon
 #
 # chkconfig: 3 86 26

diff --git a/nm.logrotate b/logrotate/nm
similarity index 100%
rename from nm.logrotate
rename to logrotate/nm