summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perl-install/run_program.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm
index c75c4d6bb..0f84b9087 100644
--- a/perl-install/run_program.pm
+++ b/perl-install/run_program.pm
@@ -111,7 +111,7 @@ sub raw {
} else {
if ($options->{setuid}) {
require POSIX;
- $ENV{'LOGNAME'} = $options->{setuid} || $ENV{LOGNAME};
+ $ENV{'LOGNAME'} = getpwuid($options->{setuid}) || $ENV{LOGNAME};
POSIX::setuid($options->{setuid});
}
generated by cgit v1.2.1 (git 2.21.0) at 2024-07-10 21:50:50 +0000
/a> 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 
package install_steps_auto_install; # $Id$

use diagnostics;
use strict;
use vars qw(@ISA $graphical @graphical_steps);

@ISA = qw(install_steps);

#-######################################################################################
#- misc imports
#-######################################################################################
use common;
use install_steps;

sub new {
    my ($type, $o) = @_;

    # Handle legacy options
    $o->{interactive} ||= 'gtk' if $graphical || !is_empty_array_ref($o->{interactiveSteps});
    push @{$o->{interactiveSteps}}, qw(installPackages exitInstall), @graphical_steps;

    if ($o->{interactive}) {
        my $interactiveClass = "install_steps_$o->{interactive}";
	require"$interactiveClass.pm"; #- no space to skip perl2fcalls

	@ISA = ($interactiveClass, @ISA);

	for (my $f = $o->{steps}{first}; $f; $f = $o->{steps}{$f}{next}) {
	    my $auto_name = member($f, @{$o->{interactiveSteps}}) ? 'noauto' : 'auto';
	    $o->{steps}{$f}{$auto_name} = 1;
	}

	goto &{$::{$interactiveClass . "::"}{new}};
    } else {
	@ISA = ('install_steps_auto_install_non_interactive', @ISA);
	(bless {}, ref $type || $type)->install_steps::new($o);
    }
}


sub exitInstall {
    my ($o, $alldone) = @_;
    return if $o->{autoExitInstall};

    if ($o->{interactive}) {
	$o->SUPER::exitInstall($alldone);
    } else {
	install_steps::exitInstall($o);
	print "\a";
	print "Auto installation complete (the postInstall is not done yet though)\n";
	print "Press <Enter> to reboot\n";
	<STDIN>;
    }
}


#-######################################################################################
#- install_steps_auto_install_non_interactive package
#-######################################################################################
package install_steps_auto_install_non_interactive;

use install_steps;
use lang;
use modules;
use common;
use log;

sub configureNetwork {
    my ($o) = @_;
    modules::load_category('network/main|usb');
    goto &install_steps::configureNetwork;
}

sub enteringStep {
    my ($o, $step) = @_;
    my ($s, $t) = (__("Entering step `%s'\n"), $o->{steps}{$step}{text});
    ($s, $t) = (translate($s), translate($t)) if $ENV{LANG} !~ /ja|ko|zh/;
    print sprintf($s, $t);
    $o->install_steps::enteringStep($step);
}

sub ask_warn {
    log::l(ref $_[1] ? join " ", @{$_[1]} : $_[1]);
}

sub wait_message {}

sub errorInStep {
    print "error :(\n"; 
    print "switch to console f2 for a shell\n";
    print "Press <Enter> to reboot\n";
    <STDIN>;
    c::_exit(0);
}