diff options
| author |   wiktor w brodlo <wiktor@brodlo.net> | 2011-08-21 00:33:58 +0000 |
|---|---|---|
| committer | wiktor w brodlo <wiktor@brodlo.net> | 2011-08-21 00:33:58 +0000 |
| commit | 4fe8eea2db12021718326b3f1e1113a3ae99031c (patch) | |
| tree | d20b8ecc36ecdf4a24fc783d8143446e1374fe6f | |
| parent | gentoo/__init__.py: fall back to webrsync (diff) | |
| download | anaconda-4fe8eea2db12021718326b3f1e1113a3ae99031c.tar.gz anaconda-4fe8eea2db12021718326b3f1e1113a3ae99031c.tar.bz2 anaconda-4fe8eea2db12021718326b3f1e1113a3ae99031c.zip | |
utils.py: added a bunch of selfs, copy /etc/resolv.conf
| -rw-r--r-- | gentoo/utils.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gentoo/utils.py b/gentoo/utils.py index 49d6ee2..37660ce 100644 --- a/gentoo/utils.py +++ b/gentoo/utils.py @@ -781,8 +781,8 @@ class GentooInstall: action = _("Unpacking stage3") self._anaconda._intf.instProgress.terminal.run_command("tar xvjpf "+productPath+" -C "+self._root) - os.system("mount -t proc none %s/proc" % self._root) - + os.system("mount -t proc none %s/proc" % self._root) + shutil.copy2("/etc/resolv.conf", self._root+"/etc/") self._progress.set_fraction(1) @@ -825,7 +825,6 @@ class GentooInstall: def install_setup_tools(self): self._progress.set_fraction(0.0) self._progress.set_text(_("Installing configuration helpers")) - shutil.copy2("/etc/resolv.conf", self._root+"/etc/") os.environ["USE"] = "multislot policykit -gtk -X -gpm -truetype" os.mkdir(self._root+"/etc/portage") keywordsf = open(self._root+"/etc/portage/package.keywords", "w") @@ -885,7 +884,7 @@ class GentooInstall: def install_kernel(self): self._progress.set_text(_("Installing the kernel")) - if self.anaconda.genkernel: + if self._anaconda.genkernel: subprocess.call(["mount", "/dev/sr0", "/mnt/cdrom"]) shutil.copy2("/mnt/cdrom/boot/gentoo", self._root+"/boot/kernel-gentoo") shutil.copy2("/mnt/cdrom/boot/gentoo.igz", self._root+"/boot/initrd-gentoo") @@ -895,9 +894,9 @@ class GentooInstall: shutil.copy2("/usr/src/linux-"+self.anaconda.kernel, self._root+"/usr/src/") self._progress.set_fraction(0.5) self._progress.set_text(_("Compiling your custom kernel")) - anaconda._intf.instProgress.terminal.run_command("chroot "+self._root+" eselect kernel set 1") - anaconda._intf.instProgress.terminal.run_command("cd "+self._root+"/usr/src/linux") - anaconda._intf.instProgress.terminal.run_command("make && make modules && make modules_install") + self._anaconda._intf.instProgress.terminal.run_command("chroot "+self._root+" eselect kernel set 1") + self._anaconda._intf.instProgress.terminal.run_command("cd "+self._root+"/usr/src/linux") + self._anaconda._intf.instProgress.terminal.run_command("make && make modules && make modules_install") shutil.copy2(self._root+"/usr/src/linux/arch/x86/boot/bzImage", self._root+"/boot/kernel-gentoo") self._progress.set_fraction(1.0) |