Changeset 10

Timestamp:

08/01/07 12:34:43 (17 years ago)

Author:

adi

Message:

Adrian's patches up to his internal revision r3471.

• rewrite /etc/default/torque after dpkg-reconfigure
• stop daemons (move to preinst?)
• postrm/preinst hooks for dh_makeshlibs not working.

Location:

trunk

Files:

• changelog (modified) (1 diff)
• postinst (modified) (6 diffs)
• postrm (modified) (1 diff)
• torque.config (added)
• torque.templates (added)

trunk/changelog

@@ -4 +4 @@
   * Added Build-Depends libpam0g-dev and sed (for debian/patches/apply_patch)
   * Removed info.ex and diversion.ex
-
- -- Adrian Knoth <adi@thur.de>  Thu, 26 Jul 2007 12:14:43 +0200
+  * added debconf support
+
+ -- Adrian Knoth <adi@thur.de>  Tue, 31 Jul 2007 16:38:49 +0200
 
 torque (2.1.7p0-1) unstable; urgency=low

trunk/postinst

@@ -18 +18 @@
 
 
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+
 # Also build the tclindexes again for xpbs xpbsmon
 #
@@ -33 +37 @@
 #
 create_default_torque_file() {
+    PBS_SERVER=0
+    PBS_MOM=0
+    PBS_SCHED=0
+
+    db_get torque/daemon_list
+
+    for daemon in $RET; do
+        daemon=${daemon%,}
+
+        case "$daemon" in
+            pbs_server)
+                PBS_SERVER=1
+                ;;
+            pbs_mom)
+                PBS_MOM=1
+                ;;
+            pbs_sched)
+                PBS_SCHED=1
+                ;;
+        esac
+    done
+
   cat > $CONFIG_FILE << EOF
 #
@@ -38 +64 @@
 # created with install of torque
 #
-# setting default to run pbs_mom. To enable an service
-# set the value to 1.
+# Do not edit this file by hand, use
 #
+#     dpkg-reconfigure -p low torque
 #
-PBS_MOM=1
-PBS_SCHED=0
-PBS_SERVER=0
+# instead
+
+PBS_MOM=$PBS_MOM
+PBS_SCHED=$PBS_SCHED
+PBS_SERVER=$PBS_SERVER
 
 PBS_MOM_OPTS=''
@@ -53 +81 @@
 }
 
-if [ ! -f $CONFIG_FILE ]
+
+if [ "$1" = configure -o ! -f $CONFIG_FILE ]
 then
         create_default_torque_file
@@ -59 +88 @@
         # If old style config replace it we new one
         #
+    # adi@2007-07-31: not covered by debconf
         OLD_CONFIG=`awk '/^HOST=/ {  print $0 }'  $CONFIG_FILE`
         if [ ! -z "$OLD_CONFIG" ]
@@ -86 +116 @@
 
 
+#DEBHELPER#
+
+
 # Automatically added by dh_installinit
 if [ -x "/etc/init.d/torque" ]; then
         update-rc.d torque defaults >/dev/null
         if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+        if [ "$1" = configure ]; then
+            invoke-rc.d torque stop || true
+        fi
                 invoke-rc.d torque start || exit 0
         else
+        if [ "$1" = configure ]; then
+            /etc/init.d/torque stop || true
+        fi
                 /etc/init.d/torque start || exit 0
         fi
 fi
 # End automatically added section
+
+

trunk/postrm

@@ -11 +11 @@
 then
         /bin/rm $CONFIG_FILE
+
+    # if we still have debconf, also remove our entries from the DB
+    if [ -e /usr/share/debconf/confmodule ]
+    then
+        # Source debconf library.
+        . /usr/share/debconf/confmodule
+        db_purge
+    fi
 fi
+
+
+#DEBHELPER#