File apcupsd-suse.patch of Package apcupsd

Overview Repositories Revisions Requests Users Attributes Meta

File apcupsd-suse.patch of Package apcupsd (Revision 90ac6229197b0c0b73984a8c61ef189f)

Currently displaying revision 90ac6229197b0c0b73984a8c61ef189f , Show latest

--- apcupsd-3.10.16/platforms/suse/Makefile.in
+++ apcupsd-3.10.16/platforms/suse/Makefile.in
@@ -1,25 +1,13 @@
 # Makefile template
 #
-# Copyright (C) 2004 D. Scott Barninger <barninger at fairfieldcomputers dot com>
-#
-# Modified from file
-# Copyright (C) 2004 D. Scott Barninger <barninger at fairfieldcomputers dot com>
-# Copyright (C) 2004 Kern Sibbald <kern at sibbald dot com>
-# Modified from file:
 # Copyright (C) 1999-2002 Riccardo Facchetti <riccardo@master.oasi.gpa.it>
-# 
-# This file is used as the template to create the
-# Makefile for the SuSE specific installation.
 #
-#  25 Sep 1999 -- KES
-#  25 Apr 2004 -- DSB
 
 # Default variables
 @VARIABLES@
 # TOP source directory.
 topdir = @topdir@
 top_builddir = $(topdir)
-VER=`echo "$(DISTVER)" | cut -d. -f1`
 
 # Include the default make targets: to be put before the all-targets: rule.
 @TARGETS@
@@ -27,80 +15,19 @@
 all-targets: Makefile
 
 install:
-	@if test $(VER) -ge 9; then \
-	   if test x$(DESTDIR) = x ; then \
-	      if test -f /etc/rc.d/apcupsd; then \
-		  /sbin/chkconfig --del apcupsd; \
-	      fi; \
-	   fi; \
-	fi
-	# remove old 3.6.2 stuff
-	@rm -f $(DESTDIR)/etc/rc.d/rc0.d/K20apcups
-	@rm -f $(DESTDIR)/etc/rc.d/rc1.d/S20apcups
-	@rm -f $(DESTDIR)/etc/rc.d/rc1.d/K20apcups
-	@rm -f $(DESTDIR)/etc/rc.d/rc2.d/S20apcups
-	@rm -f $(DESTDIR)/etc/rc.d/rc3.d/S20apcups
-	@rm -f $(DESTDIR)/etc/rc.d/rc5.d/S20apcups
-	@rm -f $(DESTDIR)/etc/rc.d/rc6.d/K20apcups
-	@rm -f $(DESTDIR)/etc/rc.d/init.d/apcups
-	@$(INSTALL_PROGRAM) -m 744 apcupsd $(DESTDIR)/etc/rc.d/apcupsd
-	# save old halt script
-	@cp -f /etc/rc.d/halt $(DESTDIR)/etc/rc.d/halt.old
-	# insert apcupsd script into halt
-	@awk -f awkhaltprog $(DESTDIR)/etc/rc.d/halt.old >$(DESTDIR)/etc/rc.d/halt
-	@chmod 744 $(DESTDIR)/etc/rc.d/halt
-	# link new halt script for startup and shutdown
-	@if test $(VER) -ge 9; then \
-	   if test x$(DESTDIR) = x ; then \
-	      /sbin/chkconfig --add apcupsd; \
-	   fi; \
-	fi
-	@if test $(VER) -lt 9; then \
-	   echo "Installing apcupsd boot script..."; \
-	   $(INSTALL_PROGRAM) -m 744 apcupsd /etc/rc.d/apcupsd; \
-	   sh ./halt-setup.sh install; \
-	   sh ./rc.config.sh install; \
-	   sh ../install-symlinks.sh install $(DISTNAME) $(DISTVER); \
-	fi
-	@echo "================================================="
-	@echo " "
-	@echo "apcupsd script installation for SuSE $(DISTVER) complete." 
-	@echo " "
-	@echo "You should now edit  /etc/apcupsd/apcupsd.conf  to correspond"
-	@echo "to your setup then start the apcupsd daemon with:"
-	@echo " "
-	@echo "/etc/rc.d/apcupsd start"
-	@echo " "
-	@echo "thereafter when you reboot, it will be stopped and started"
-	@echo "automatically."
-	@echo " "
-	@echo "Please check that your halt script in:"
-	@echo "    /etc/rc.d/halt"
-	@echo "was properly updated (see installation section of manual)"
-	@echo " "
-	@echo "================================================="
+	@echo "Installing apcupsd boot script..."
+	install -d -m 755 $(DESTDIR)/etc/init.d/
+	$(INSTALL_PROGRAM) -m 744 apcupsd $(DESTDIR)/etc/init.d/apcupsd
 
 uninstall:
-	@if test $(VER) -ge 9; then \
-	   echo "Removing symlinks..."; \
-	   if test x$(DESTDIR) = x ; then \
-	      /sbin/chkconfig --del apcupsd ; \
-	   fi; \
-	   echo "Removing boot script..."; \
-	   rm -f $(DESTDIR)/etc/rc.d/apcupsd; \
-	   echo "Restoring old halt script"; \
-	   cp -f $(DESTDIR)/etc/rc.d/halt.old /etc/rc.d/halt; \
-	fi
-	@if test $(VER) -lt 9; then \
-	   echo "Removing boot script..."; \
-	   rm -f /etc/rc.d/apcupsd; \
-	   sh ./halt-setup.sh uninstall; \
-	   sh ./rc.config.sh uninstall; \
-	   sh ../install-symlinks.sh uninstall $(DISTNAME) $(DISTVER); \
-	fi
+	@echo "Removing boot script..."
+	@rm -f /etc/rc.d/apcupsd
+	sh ./halt-setup.sh uninstall
+	sh ./rc.config.sh uninstall
+	sh ../install-symlinks.sh uninstall $(DISTNAME) $(DISTVER)
 
 clean:
 
 distclean:
-	@rm -f apccontrol.sh apcupsd awkhaltprog Makefile apcupsd.spec
+	@rm -f apcupsd halt-setup.sh Makefile halt apccontrol.sh
 	@rm -rf CVS
--- apcupsd-3.10.16/platforms/suse/halt-setup.sh.in
+++ apcupsd-3.10.16/platforms/suse/halt-setup.sh.in
@@ -14,36 +14,43 @@
 exec_prefix=@exec_prefix@               # $MAGICWORD
 APCCONTROL="@sysconfdir@/apccontrol killpower"
 
+function remove_halt_local()
+{
+# Note: Old versions of SuSE installer have had a bug: Last "fi"
+# command was not commented by $MAGICWORD and was not replaced during
+# update. This script tries to detect such orphan "fi".
+	sed ':1;/XXX APCUPSD - DO NOT EDIT XXX/,+1s/^fi$/& # XXX APCUPSD - DO NOT EDIT XXX/;t1' </etc/init.d/halt.local | grep -v "$MAGICWORD" > /etc/init.d/halt.local.tmp
+	mv /etc/init.d/halt.local.tmp /etc/init.d/halt.local
+}
+
 case "$1" in
 install)
 
-if [ -f /etc/rc.d/halt.local ]
+if [ -f /etc/init.d/halt.local ]
 then
-# Check if it is not already installed.
-        RESULT=`grep "$MAGICWORD" /etc/rc.d/halt.local`
-        if [ -z "$RESULT" ]
+        remove_halt_local
+        # Install new sequence even if there is already installed.
+        # check for last line is "exit 0" as in SuSE 5.2
+        RESULT=`tail -n 1 /etc/init.d/halt.local`
+        if [ "$RESULT" = "exit 0" ]
         then
-                # check for last line is "exit 0" as in SuSE 5.2
-                RESULT=`tail -1 /etc/rc.d/halt.local`
-                if [ "$RESULT" = "exit 0" ]
-                then
-                        echo "Last line in /etc/rc.d/halt.local is \"exit 0\""
-                        NUM=`grep -c "" /etc/rc.d/halt.local`
-                        NUM="$(echo $NUM | \
-                        awk '{print $1 -1}')"
-                        head -$NUM /etc/rc.d/halt.local > /etc/rc.d/halt.local.tmp
-                        mv /etc/rc.d/halt.local.tmp /etc/rc.d/halt.local
-                        chmod u+x /etc/rc.d/halt.local
-                        echo "... removed"
-                fi
-                echo "Adding apcupsd routines to local halt script..."
-                cat >> /etc/rc.d/halt.local <<EOF
+                echo "Last line in /etc/init.d/halt.local is \"exit 0\""
+                NUM=`grep -c "" /etc/init.d/halt.local`
+                NUM="$(echo $NUM | \
+                awk '{print $1 -1}')"
+                head -n $NUM /etc/init.d/halt.local > /etc/init.d/halt.local.tmp
+                mv /etc/init.d/halt.local.tmp /etc/init.d/halt.local
+                chmod u+x /etc/init.d/halt.local
+                echo "... removed"
+        fi
+        echo "Adding apcupsd routines to local halt script..."
+        cat >> /etc/init.d/halt.local <<EOF
 # Added automatically by apcupsd installation       # $MAGICWORD
 if [ -f @PWRFAILDIR@/powerfail ]; then              # $MAGICWORD
     echo "Power down detected while shutting down." # $MAGICWORD
     echo "Sending all processes the TERM signal..." # $MAGICWORD
     killall5 -15                                    # $MAGICWORD
-#   Do a fast kill                                  # $MAGICWORD
+    # Do a fast kill                                # $MAGICWORD
     sleep 1                                         # $MAGICWORD
     echo "Sending all processes the KILL signal..." # $MAGICWORD
     killall5 -9                                     # $MAGICWORD
@@ -51,46 +58,24 @@
     mounts=/etc/fstab                               # $MAGICWORD
     test -r /proc/mounts && mounts=/proc/mounts     # $MAGICWORD
     while read des fs rest; do                      # $MAGICWORD
-        mount -v -n -o remount,ro \$fs              # $MAGICWORD
-    done < \$mounts                                 # $MAGICWORD
+        mount -v -n -o remount,ro \$fs               # $MAGICWORD
+    done < \$mounts                                  # $MAGICWORD
     echo "Preparing UPS to power shutdown."         # $MAGICWORD
-    $APCCONTROL                                     # $MAGICWORD
+    $APCCONTROL               # $MAGICWORD
 fi                                                  # $MAGICWORD
 EOF
-        else
-                echo "No need to update local halt script."
-        fi
-else
-        if [ -f /etc/rc.d/halt.O ]
-        then
-                echo "Halt script alredy backed up..."
-        else
-                echo "Saving old halt script..."
-                cp /etc/rc.d/halt /etc/rc.d/halt.O
-        fi
-        echo "Installing apcupsd halt routines..."
-        cp halt /etc/rc.d/halt
 fi
 ;;
 uninstall)
-if [ -f /etc/rc.d/halt.local ]
+if [ -f /etc/init.d/halt.local ]
 then
-        RESULT=`grep "$MAGICWORD" /etc/rc.d/halt.local`
+        RESULT=`grep "$MAGICWORD" /etc/init.d/halt.local`
         if [ -z "$RESULT" ]
         then
                 echo "apcupsd halt routines not installed."
         else
                 echo "Removing apcupsd routines from local halt script..."
-                grep -v "$MAGICWORD" /etc/rc.d/halt.local > /etc/rc.d/halt.local.tmp
-                mv /etc/rc.d/halt.local.tmp /etc/rc.d/halt.local
-        fi
-else
-        if test -f /etc/rc.d/halt.O
-        then
-                echo "Restoring default halt script..."
-                cp /etc/rc.d/halt.O /etc/rc.d/halt
-        else
-                echo "Can not find original halt script: leaving apcupsd halt in place."
+		remove_halt_local
         fi
 fi
 ;;

Places

File apcupsd-suse.patch of Package apcupsd (Revision 90ac6229197b0c0b73984a8c61ef189f)

Places