Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Remove now unused code from mgr-setup" #9468

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Revert "Remove now unused code from mgr-setup" #9468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8429cf
Revert "Remove unused hostname calls"
jordimassaguerpla Nov 13, 2024
c44a9ea
Revert "Remove now unused code from mgr-setup"
jordimassaguerpla Nov 13, 2024
e763a55
Update FaultException.java
jordimassaguerpla Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/code/src/com/redhat/rhn/FaultException.java
View file
Open in desktop
Original file line number Diff 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
5 changes: 5 additions & 0 deletions spacewalk/setup/bin/spacewalk-setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion spacewalk/setup/spacewalk-setup.changes.cbosdo.setup-cleanup
View file
Open in desktop

This file was deleted.

Loading
Loading