Conflict with chkconfig (/etc/init.d) avoided in fedora

src/tools/pkg/rpm/pwrrt/build.sh

@@ -112,7 +112,9 @@ mkdir -p $pkgroot/rpm/SPECS
 mkdir -p $pkgroot/rpm/SOURCES
 mkdir -p $pkgroot/rpm/SRPMS
 mkdir -p $pkgroot/usr/share/doc/pwrrt
-mkdir -p $pkgroot/etc/init.d
+mkdir -p $pkgroot/etc
+# init.d is a symlink on fedora that is owned by with chkconfig and causes conflict
+#mkdir -p $pkgroot/etc/init.d
 
 find $pkgroot -type d | xargs chmod 755
 
@@ -126,8 +128,8 @@ gzip -fq --best $pkgroot/usr/share/doc/pwrrt/changelog
 # Startup files
 cp $pkgsrc/pwrp_profile $pkgroot/etc
 chmod a+x $pkgroot/etc/pwrp_profile
-cp $pkgsrc/pwr $pkgroot/etc/init.d
-chmod a+x $pkgroot/etc/init.d/pwr
+#cp $pkgsrc/pwr $pkgroot/etc/init.d
+#chmod a+x $pkgroot/etc/init.d/pwr
 
 # Man pages
 mkdir -p $pkgroot/usr/share/man/man1
@@ -157,6 +159,7 @@ cd $currentdir
 
 # Copy configuration files to cnf
 cp $pkgsrc/proview.cnf $pkgroot/usr/pwrrt/cnf
+cp $pkgsrc/pwr $pkgroot/usr/pwrrt/cnf
 
 # Copy op to cnf
 mkdir $pkgroot/usr/pwrrt/cnf/op

src/tools/pkg/rpm/pwrrt/pwrrt.spec

@@ -117,7 +117,7 @@ else
   fi
 fi
 
-
+new_user=0
 if getent passwd pwrp > /dev/null; then
   echo "-- user pwrp already exist"
 else
@@ -213,6 +213,9 @@ if [ ! -e /etc/proview.cnf ]; then
   cp /usr/pwrrt/cnf/proview.cnf /etc
   new_cnf=1
 fi
+cp /usr/pwrrt/cnf/pwr /etc/init.d
+chmod a+x /etc/init.d/pwr
+
 
 # Add pwrp_profile to profile
 if ! grep -q "/etc/pwrp_profile\b" /etc/profile; then

src/tools/pkg/rpm/pwrsev/build.sh

@@ -115,7 +115,9 @@ mkdir -p $pkgroot/rpm/SPECS
 mkdir -p $pkgroot/rpm/SOURCES
 mkdir -p $pkgroot/rpm/SRPMS
 mkdir -p $pkgroot/usr/share/doc/pwrsev
-mkdir -p $pkgroot/etc/init.d
+mkdir -p $pkgroot/etc
+# init.d is a symlink on fedora that is owned by with chkconfig and causes conflict
+# mkdir $pkgroot/etc/init.d
 
 find $pkgroot -type d | xargs chmod 755
 
@@ -129,8 +131,8 @@ gzip -fq --best $pkgroot/usr/share/doc/pwrsev/changelog
 # Startup files
 cp $pkgsrc/pwrp_profile $pkgroot/etc
 chmod a+x $pkgroot/etc/pwrp_profile
-cp $pkgsrc/pwrsev $pkgroot/etc/init.d
-chmod a+x $pkgroot/etc/init.d/pwrsev
+#cp $pkgsrc/pwrsev $pkgroot/etc/init.d
+#chmod a+x $pkgroot/etc/init.d/pwrsev
 
 # Man pages
 mkdir -p $pkgroot/usr/share/man/man1
@@ -157,6 +159,7 @@ cd $currentdir
 
 # Copy configuration files to cnf
 cp $pkgsrc/proview.cnf $pkgroot/usr/pwrsev/cnf
+cp $pkgsrc/pwrsev $pkgroot/usr/pwrsev/cnf
 
 # Copy op to cnf
 mkdir $pkgroot/usr/pwrsev/cnf/op

src/tools/pkg/rpm/pwrsev/pwrsev.spec

@@ -114,7 +114,7 @@ else
   fi
 fi
 
-
+new_user=0
 if getent passwd pwrp > /dev/null; then
   echo "-- user pwrp already exist"
 else
@@ -203,6 +203,8 @@ if [ ! -e /etc/proview.cnf ]; then
   cp /usr/pwrsev/cnf/proview.cnf /etc
   new_cnf=1
 fi
+cp /usr/pwrsev/cnf/pwrsev /etc/init.d
+chmod a+x /etc/init.d/pwrsev
 
 # Add pwrp_profile to profile
 if ! grep -q "/etc/pwrp_profile\b" /etc/profile; then
@@ -391,14 +393,14 @@ fi
 # Remove startup
 
 if [ -e /etc/init.d/rc2.d ]; then
-  checklink=`eval ls /etc/init.d/rc2.d/S90pwr 2>/dev/null`
+  checklink=`eval ls /etc/init.d/rc2.d/S90pwrsev 2>/dev/null`
   if [ "$checklink" != "" ]; then
-    rm /etc/init.d/rc2.d/S90pwr
+    rm /etc/init.d/rc2.d/S90pwrsev
   fi
 elif [ -e /etc/rc2.d ]; then
-  checklink=`eval ls /etc/rc2.d/S90pwr 2>/dev/null`
+  checklink=`eval ls /etc/rc2.d/S90pwrsev 2>/dev/null`
   if [ "$checklink" != "" ]; then
-    rm /etc/rc2.d/S90pwr
+    rm /etc/rc2.d/S90pwrsev
   fi
 fi