diff options
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 3e50d5b9c..9373a1bb6 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -666,7 +666,7 @@ sub getAndSaveInstallFloppy { my $image = cat_("/proc/cmdline") =~ /pcmcia/ ? "pcmcia" : ${{ hd => 'hd', cdrom => 'cdrom', ftp => 'network', nfs => 'network', http => 'network' }}{$o->{method}}; $image .= arch() =~ /sparc64/ && "64"; #- for sparc64 there are a specific set of image. - install_any::getAndSaveFile("images/$image.img", $where) or log::l("failed to write Install Floppy ($image.img) to $where"), return; + getAndSaveFile("images/$image.img", $where) or log::l("failed to write Install Floppy ($image.img) to $where"), return; 1; } @@ -680,7 +680,7 @@ sub getAndSaveAutoInstallFloppy { my $mountdir = "$o->{prefix}/tmp/mount"; -d $mountdir or mkdir $mountdir, 0755; my $workdir = "$o->{prefix}/tmp/work"; -d $workdir or rmdir $workdir; - install_any::getAndSaveInstallFloppy($o, $imagefile) or return; + getAndSaveInstallFloppy($o, $imagefile) or return; devices::make($_) foreach qw(/dev/loop6 /dev/ram); require commands; @@ -691,7 +691,7 @@ sub getAndSaveAutoInstallFloppy { run_program::run("losetup", "-d", "/dev/loop6"); substInFile { s/timeout.*//; s/^(\s*append\s*=\s*\".*)\"/$1 kickstart=floppy\"/ } "$workdir/silo.conf"; #" for po -#-TODO output "$workdir/ks.cfg", install_any::generate_ks_cfg($o); +#-TODO output "$workdir/ks.cfg", generate_ks_cfg($o); output "$workdir/boot.msg", "\n7m", "!! If you press enter, an auto-install is going to start. ALL data on this computer is going to be lost, @@ -699,7 +699,7 @@ sub getAndSaveAutoInstallFloppy { ", "7m\n"; local $o->{partitioning}{clearall} = 1; - output("$workdir/auto_inst.cfg", install_any::g_auto_install()); + output("$workdir/auto_inst.cfg", g_auto_install()); run_program::run("genromfs", "-d", $workdir, "-f", "/dev/ram", "-A", "2048,/..", "-a", "512", "-V", "DrakX autoinst"); fs::mount("/dev/ram", $mountdir, 'romfs', 0); @@ -712,9 +712,9 @@ sub getAndSaveAutoInstallFloppy { my $imagefile = "$o->{prefix}/tmp/autoinst.img"; my $mountdir = "$o->{prefix}/tmp/mount"; -d $mountdir or mkdir $mountdir, 0755; - my $param = 'kickstart=floppy ' . install_any::generate_automatic_stage1_params($o); + my $param = 'kickstart=floppy ' . generate_automatic_stage1_params($o); - install_any::getAndSaveInstallFloppy($o, $imagefile) or return; + getAndSaveInstallFloppy($o, $imagefile) or return; my $dev = devices::set_loop($imagefile) or log::l("couldn't set loopback device"), return; fs::mount($dev, $mountdir, 'vfat', 0); @@ -732,7 +732,7 @@ sub getAndSaveAutoInstallFloppy { ", "07\n" if !$replay; local $o->{partitioning}{clearall} = !$replay; - output("$mountdir/auto_inst.cfg", install_any::g_auto_install($replay)); + output("$mountdir/auto_inst.cfg", g_auto_install($replay)); fs::umount($mountdir); commands::dd("if=$imagefile", "of=$where", "bs=1440", "count=1024"); |