Changeset 5a05bf2

Timestamp:

Jun 24, 2010, 1:49:52 AM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

nodebathena

Children:

c3b86f7

Parents:

d1a3d62

git-author:

Kyle C. Brogle <broglek@…> (06/10/10 16:31:59)

git-committer:

Jessica B. Hamrick <jhamrick@…> (06/24/10 01:49:52)

Message:

Modified debconfig to not prompt for zephyr class
modified Config file to not store a zephyr class
Modified filter to accept new config file ordering

Location:

debian

Files:

• gutenbach.config (modified) (3 diffs)
• lib/gutenbach (modified) (1 diff)
• lib/gutenbach-get-config (modified) (2 diffs)

debian/gutenbach.config

@@ -5 +5 @@
 
 printername=""
-zephyrclass=""
+#zephyrclass=""
 hostname=""
 
@@ -13 +13 @@
 fi
 
-if [ -e /usr/lib/gutenbach/config/zephyrclass ]; then
-    zephyrclass=$(cat /usr/lib/gutenbach/config/zephyrclass)
-    db_set gutenbach/zephyrclass "$zephyrclass"
-fi
+#if [ -e /usr/lib/gutenbach/config/zephyrclass ]; then
+#    zephyrclass=$(cat /usr/lib/gutenbach/config/zephyrclass)
+#    db_set gutenbach/zephyrclass "$zephyrclass"
+#fi
 
 if [ -e /usr/lib/gutenbach/config/hostname ]; then
@@ -24 +24 @@
 
 db_input high gutenbach/printername || true
-db_input high gutenbach/zephyrclass || true
+#db_input high gutenbach/zephyrclass || true
 db_input high gutenbach/hostname || true
 db_go || true

debian/lib/gutenbach

@@ -26 +26 @@
 use English;
 
-use vars qw/$zephyr_class $host $queue $mixer $channel/;
+use vars qw/ $host $queue $mixer $channel/;
 
 require "/usr/lib/gutenbach/config/gutenbach-filter-config.pl" or die "Unable to load configuration";

debian/lib/gutenbach-get-config

@@ -3 +3 @@
 # Get configuration of gutenbach
 
-my $zephyr_class = `hostname`;
-chomp($zephyr_class);
+#my $zephyr_class = `hostname`;
+#chomp($zephyr_class);
 my $host = `hostname`;
 chomp($zephyr_class);
@@ -22 +22 @@
 
 my %config = (
-    'zephyr-class' => $zephyr_class,
+   # 'zephyr-class' => $zephyr_class,
     'host' => $host,
     'queue' => $queue,