--- /LTSP_SRC/ltsp-utils/ltspcfg	2004-08-16 07:32:30.000000000 +0200
+++ /ltspcfg-AlberT	2004-08-25 17:14:10.000000000 +0200
@@ -1234,9 +1234,11 @@
       main::cont();
     }
     elsif( $self->{enabled} ){
-	  my $run = ($self->{running}) ? " and running" : "";
+      my $run = ($self->{running}) ? " and running" : "";
       print("\n\ndhcpd is already enabled$run!\n");
-      main::cont();
+      if( main::get_yn("Do you want to build a dhcpd.conf file") eq "Y" ){
+        $self->build_conf(); 
+      }
     }
     else{
       if( main::get_yn("Do you want to enable the dhcpd daemon") eq "Y" ){
@@ -1246,6 +1248,7 @@
         $self->build_conf(); 
       }
     }
+    main::cont()
   }  # sub configure_screen
 
   sub build_conf {
@@ -1371,8 +1374,6 @@
     print("Done\n");
 
     main::verbose_line("\nThe dhcpd config file has been created as: $filename");
-    main::cont();
-
   }  # sub build_conf
 
   sub enable {
@@ -1587,8 +1588,6 @@
 
     $self->is_enabled();       # After enabling, lets check to see if it worked
 
-    main::cont();
-
   }  # sub enable
 }  # package Dhcpd
 
@@ -1900,9 +1899,11 @@
       my $cmd = "insserv /etc/init.d/nfsserver,start=$level";
       system( $cmd );
     }
-#    elsif( -x "/usr/sbin/update-rc.d" ){                   # Debian system
-#      # Don't need to do anything, cuz Debian starts portmap in runlevel S
-#    }
+    elsif( -x "/usr/sbin/update-rc.d" ){                   # Debian system
+      # Don't need to do anything, cuz Debian starts portmap in runlevel S
+      print("\nIt seems, you are on a Debian system;\n".
+            "portmap is started in runleve S, nothing to do.\n");
+    }
     elsif( -x "/sbin/chkconfig" ){                         # Redhat or Mandrake
       my $cmd = "chkconfig --level $level nfs on";
       system( $cmd );
@@ -2402,9 +2403,7 @@
     if( ! $self->{installed} ){
       print("\n\nThe Xdmcp service is not installed!\n");
       print("\nPlease install it, and then come back here and enable it.\n");
-      main::cont();
     }
-
     elsif( $self->{running} ){
       print("\n\nThe Xdmcp service is already enabled and running!\n");
     }
@@ -3012,7 +3011,7 @@
 	if ( $self->{configured} ) {
       print("$filename has been already configured by LTSP.\n");
 	  
-	  my $answer = main::get_yn("Do you want to remove every LTSP entry from $filename?");
+	  my $answer = main::get_yn("Do you want to remove every LTSP entry from $filename");
 
       if( $answer eq "Y" ){
 	  	$self->cleanup( *FH );
@@ -3042,7 +3041,7 @@
     print("configuration step.  Otherwise, it is recommended that you add\n");
     print("entries to the /etc/hosts file for each workstation.\n");
 
-    my $answer = main::get_yn("Do you want to add entries to $filename$again?");
+    my $answer = main::get_yn("Do you want to add entries to $filename$again");
 
     if( $answer eq "Y" ){
 	  
@@ -3115,7 +3114,7 @@
 	if ( $self->{configured} ) {
       print("$filename has been already configured by LTSP.\n");
 	  
-	  my $answer = main::get_yn("Do you want to remove every LTSP entry from $filename?");
+	  my $answer = main::get_yn("Do you want to remove every LTSP entry from $filename");
 
       if( $answer eq "Y" ){
 	  	$self->cleanup( *FH );
@@ -3137,7 +3136,7 @@
     print("\n");
     print("ltspcfg can add the necessary entries to $filename for you.\n");
 
-    my $answer = main::get_yn("Do you want to add entries to $filename$again?");
+    my $answer = main::get_yn("Do you want to add entries to $filename$again");
     if( $answer eq "Y" ){
       main::backup($filename);
       if ( $self->{configured} ) {
@@ -3203,7 +3202,7 @@
 	if ( $self->{configured} ) {
       print("$filename has been already configured by LTSP.\n");
 	  
-	  my $answer = main::get_yn("Do you want to remove every LTSP entry from $filename?");
+	  my $answer = main::get_yn("Do you want to remove every LTSP entry from $filename");
 
       if( $answer eq "Y" ){
 	  	$self->cleanup( *FH );
@@ -3225,7 +3224,7 @@
     print("\n");
     print("ltspcfg can add the necessary entries to $filename for you.\n");
 
-    my $answer = main::get_yn("Do you want to add entries to $filename$again?");
+    my $answer = main::get_yn("Do you want to add entries to $filename$again");
     if( $answer eq "Y" ){
       main::backup($filename);
       if ( $self->{configured} ) {
@@ -3295,10 +3294,10 @@
     if( -f $filename ){
       printf("\n");
       printf("The $filename file already exists!\n");
-      $answer = main::get_yn("Are you sure you want to overwrite it?");
+      $answer = main::get_yn("Are you sure you want to overwrite it");
     }
     else{
-      $answer = main::get_yn("Do you want to create a default lts.conf file?");
+      $answer = main::get_yn("Do you want to create a default lts.conf file");
     }
 
     if( $answer eq "Y" ){