summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2006-02-24 11:36:58 +0000
committerOlivier Blin <oblin@mandriva.org>2006-02-24 11:36:58 +0000
commitdc018d7c472f5b622a1f3df0bbdd8430fdeb4b79 (patch)
tree3e45027873c6e3645f00c83e3fc105896be4f126
parent6a57d9f1db3f77e8918b405aa55cdb12ba04709d (diff)
downloaddrakx-dc018d7c472f5b622a1f3df0bbdd8430fdeb4b79.tar
drakx-dc018d7c472f5b622a1f3df0bbdd8430fdeb4b79.tar.gz
drakx-dc018d7c472f5b622a1f3df0bbdd8430fdeb4b79.tar.bz2
drakx-dc018d7c472f5b622a1f3df0bbdd8430fdeb4b79.tar.xz
drakx-dc018d7c472f5b622a1f3df0bbdd8430fdeb4b79.zip
install ntp (#21287)
Diffstat
-rw-r--r--live/One/2006.0/config/auto_inst.cfg.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/live/One/2006.0/config/auto_inst.cfg.pl b/live/One/2006.0/config/auto_inst.cfg.pl
index a2cd76c46..1a2272c84 100644
--- a/live/One/2006.0/config/auto_inst.cfg.pl
+++ b/live/One/2006.0/config/auto_inst.cfg.pl
@@ -116,6 +116,9 @@ $o = {
'saned',
'kdegraphics-kooka',
+ #- drakclock
+ 'ntp',
+
#- useful packages
'ndiswrapper',
'xmoto',
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-02 10:07:31 +0000
"hl opt">); } -d 'media' or die "02create_pkgs.t not done\n"; system('rm -rf root'); isnt(-d 'root', "test root dir can not be removed $!"); mkdir 'root'; $using_root = 1; $ENV{LC_ALL} = 'C'; } my $server_pid; sub httpd_port { 6969 } sub start_httpd() { system('perl -MNet::Server::Single -e 1') == 0 or die "module Net::Server::Single is missing (package perl-Net-Server)\n"; $server_pid = fork(); if ($server_pid == 0) { exec './simple-httpd', $::pwd, "$::pwd/tmp", httpd_port(); exit 1; } 'http://localhost:' . httpd_port(); } chdir 't' if -d 't'; mkdir 'tmp'; chomp($::pwd = `pwd`); my $urpmi_debug_opt = '-q'; #$urpmi_debug_opt = '-v --debug'; sub urpm_cmd { my ($prog, $o_perl_para) = @_; $o_perl_para ||= ''; "perl $o_perl_para -I.. ../$prog --urpmi-root $::pwd/root $urpmi_debug_opt"; } sub urpm_cmd_no_quiet { my ($prog, $o_perl_para) = @_; $o_perl_para ||= ''; "perl $o_perl_para -I.. ../$prog --urpmi-root $::pwd/root"; } sub run_urpm_cmd { my ($prog, $o_perl_para) = @_; my $cmd = urpm_cmd_no_quiet($prog, $o_perl_para); print "# $cmd\n"; `$cmd`; } sub urpmi_cmd() { urpm_cmd('urpmi') } sub urpmi_addmedia { my ($para) = @_; system_(urpm_cmd('urpmi.addmedia') . " $para"); } sub urpmi_removemedia { my ($para) = @_; system_(urpm_cmd('urpmi.removemedia') . " $para"); } sub urpmi_update { my ($para) = @_; system_(urpm_cmd('urpmi.update') . " $para"); } sub urpmi { my ($para) = @_; system_(urpmi_cmd() . " --ignoresize $para"); } sub test_urpmi_fail { my ($para) = @_; system_should_fail(urpmi_cmd() . " $para"); } sub urpme { my ($para) = @_; system_(urpm_cmd('urpme') . " $para"); } sub urpmi_cfg() { "$::pwd/root/etc/urpmi/urpmi.cfg"; } sub set_urpmi_cfg_global_options { my ($options) = @_; require_ok('urpm::cfg'); ok(my $config = urpm::cfg::load_config(urpmi_cfg())); $config->{global} = $options; ok(urpm::cfg::dump_config(urpmi_cfg(), $config), 'set_urpmi_cfg_global_options'); } sub system_ { my ($cmd) = @_; system($cmd); ok($? == 0, $cmd); } sub system_should_fail { my ($cmd) = @_; system($cmd); # on some error questions ("Do you want to... (y/N)?"), urpmi doesn't output "\n": print "\n"; $? & 127 ? is($? & 127, 0, "should fail nicely but not get killed: $cmd") : ok($? != 0, "should fail: $cmd"); } sub rpm_is_jbj_version { # checking for --yaml support `rpm --help` =~ /yaml/; } sub check_installed_fullnames { my (@names) = @_; is(`rpm -qa --root $::pwd/root | sort`, join('', map { "$_\n" } sort(@names))); } sub check_installed_names { my (@names) = @_; is(`rpm -qa --qf '%{name}\\n' --root $::pwd/root | sort`, join('', map { "$_\n" } sort(@names))); } sub check_nothing_installed() { is(`rpm -qa --root $::pwd/root`, ''); } sub check_installed_and_remove { my (@names) = @_; check_installed_names(@names); system_("rpm --root $::pwd/root -e " . join(' ', @names)) if @names; check_nothing_installed(); } sub check_installed_fullnames_and_remove { my (@names) = @_; check_installed_fullnames(@names); system_("rpm --root $::pwd/root -e " . join(' ', @names)) if @names; check_nothing_installed(); } sub check_installed_and_urpme { my (@names) = @_; check_installed_names(@names); urpme(join(' ', @names)); check_nothing_installed(); } END { $using_root and system('rm -rf root'); $server_pid and kill(9, $server_pid); system('rm -rf tmp'); } 1;
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-02 10:07:31 +0000