Merge pull request #44 from uyuni-project/revert-9450-setup-cleanup

Revert 9450 setup cleanup
uyuni-project · Nov 21, 2024 · de5dfa2 · de5dfa2
2 parents 0194bae + 6effbdc
commit de5dfa2
Show file tree

Hide file tree

Showing 5 changed files with 693 additions and 29 deletions.
diff --git a/java/code/src/com/redhat/rhn/FaultException.java b/java/code/src/com/redhat/rhn/FaultException.java
@@ -17,7 +17,7 @@
 
 import com.redhat.rhn.common.localization.LocalizationService;
 import com.redhat.rhn.common.validator.ValidatorResult;
-
+// TEST
 import java.util.Optional;
 
 /**

diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
@@ -56,6 +56,11 @@ push @skip, Spacewalk::Setup::EMBEDDED_DB_ANSWERS
 Spacewalk::Setup::load_answer_file(\%opts, \%answers, \@skip);
 my $product_name = $answers{'product_name'} || 'Spacewalk';
 
+my $hn = `/bin/hostname -f`;
+chomp($hn);
+$hn = Sys::Hostname::hostname if(!defined $hn || $hn eq "");
+$answers{hostname} ||= "$hn";
+
 if (not $opts{"skip-fqdn-test"} and
     not (lc($answers{hostname}) eq $answers{hostname})) {
     print Spacewalk::Setup::loc(

diff --git a/spacewalk/setup/spacewalk-setup.changes.cbosdo.setup-cleanup b/spacewalk/setup/spacewalk-setup.changes.cbosdo.setup-cleanup
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
     import com.redhat.rhn.common.localization.LocalizationService;
     import com.redhat.rhn.common.validator.ValidatorResult;
+    // TEST
     import java.util.Optional;
     /**
@@ Expand Down @@