Changeset 22

Timestamp:

11/07/07 17:21:56 (16 years ago)

Author:

adi

Message:

Handle PBS_{SCHED,MOM,SERVER}_OPTS via debconf

Location:

trunk

Files:

• postinst (modified) (4 diffs)
• torque.config (modified) (1 diff)
• torque.templates (modified) (2 diffs)

trunk/postinst

@@ -38 +38 @@
 #
 create_default_torque_file() {
+    set_conf_options() {
+        RESULT=""
+        db_get torque/$1 || true
+        if [ $? -eq 0 ]; then
+            RESULT=$RET
+        fi
+    }
+
     PBS_SERVER=0
     PBS_MOM=0
     PBS_SCHED=0
+    PBS_MOM_OPTS=""
+    PBS_SCHED_OPTS=""
+    PBS_SERVER_OPTS=""
 
     db_get torque/daemon_list
@@ -47 +58 @@
         daemon=${daemon%,}
 
+        # this sets $RESULT
+        set_conf_options ${daemon}_opts
+
         case "$daemon" in
             pbs_server)
                 PBS_SERVER=1
+                PBS_SERVER_OPTS=$RESULT
                 ;;
             pbs_mom)
                 PBS_MOM=1
+                PBS_MOM_OPTS=$RESULT
                 ;;
             pbs_sched)
                 PBS_SCHED=1
+                PBS_SCHED_OPTS=$RESULT
                 ;;
         esac
@@ -69 +86 @@
 #     dpkg-reconfigure -p high torque
 #
-# instead
+# to change which daemons to start or
+#
+#     dpkg-reconfigure -p medium torque
+#
+# to even change startup options (PBS_{MOM,SCHED,SERVER}_OPTS).
 
 PBS_MOM=$PBS_MOM
@@ -75 +96 @@
 PBS_SERVER=$PBS_SERVER
 
-PBS_MOM_OPTS=''
-PBS_SCHED_OPTS=''
-PBS_SERVER_OPTS='-a t'
+PBS_MOM_OPTS="$PBS_MOM_OPTS"
+PBS_SCHED_OPTS="$PBS_SCHED_OPTS"
+PBS_SERVER_OPTS="$PBS_SERVER_OPTS"
 
 EOF

trunk/torque.config

@@ -16 +16 @@
 db_go
 
+# If the user wants daemons, ask for any options to be passed
+db_get torque/daemon_list
+for daemon in $RET; do
+    daemon=${daemon%,}
+    db_input medium torque/${daemon}_opts || true
+    db_go
+done
+

trunk/torque.templates

@@ -1 +1 @@
 Template: torque/disclaimer
 Type: note
-Description: This debconf isn't fully functional. Configure in /etc/default/torque
+Description: This debconf isn't fully functional.
  We currently do not provide full-featured torque configuration via debconf.
- See /etc/default/torque to define which daemons to start and use qmgr or the
- files in /var/spool/torque for everything else.
+ We just care about /etc/default/torque to define which daemons to start.
+ .
+ Use qmgr or the files in /var/spool/torque for everything else.
 
 Template: torque/daemon_list
@@ -23 +24 @@
  .
  Don't modify this file by hand, it will be overwritten anytime you upgrade
- this package. Use "dpkg-reconfigure -p low torque" instead.
+ this package. Use "dpkg-reconfigure -p high torque" instead.
+
+Template: torque/pbs_mom_opts
+Type: string
+Description: Please enter the options to be passed to pbs_mom
+ Please enter the commandline options for pbs_mom. You can usually leave it
+ empty.
+ .
+ The value will be stored in /etc/default/torque.
+ .
+ Don't modify this file by hand, it will be overwritten anytime you upgrade
+ this package. Use "dpkg-reconfigure -p medium torque" instead.
+
+Template: torque/pbs_sched_opts
+Type: string
+Description: Please enter the options to be passed to pbs_sched
+ Please enter the commandline options for pbs_sched. You can usually leave it
+ empty.
+ .
+ The value will be stored in /etc/default/torque.
+ .
+ Don't modify this file by hand, it will be overwritten anytime you upgrade
+ this package. Use "dpkg-reconfigure -p medium torque" instead.
+
+Template: torque/pbs_server_opts
+Type: string
+Default: -a t
+Description: Please enter the options to be passed to pbs_server
+ Please enter the commandline options for pbs_server.
+ The default is "-a t"
+ .
+ The value will be stored in /etc/default/torque.
+ .
+ Don't modify this file by hand, it will be overwritten anytime you upgrade
+ this package. Use "dpkg-reconfigure -p medium torque" instead.