diff options
| author | Peter Jones <pjones@redhat.com> | 2008-03-14 15:59:22 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@pjones2.localdomain> | 2008-03-14 15:59:22 -0400 |
| commit | 0a2894de2b6ac25d6148729385936d352350c6b3 (patch) | |
| tree | 79cf0d6dad44ef860d4834c3d09c2ac870c8517e /instdata.py | |
| parent | 6289d4eb0421c127ac98386d6e30bdd270115813 (diff) | |
| parent | 4ce7fadb86523cda81c2dc4cb792f751a1dbedef (diff) | |
Merge branch 'master' of git+ssh://git.fedoraproject.org/git/hosted/anaconda
Diffstat (limited to 'instdata.py')
| -rw-r--r-- | instdata.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/instdata.py b/instdata.py index e1175f2fe..bf5300a04 100644 --- a/instdata.py +++ b/instdata.py @@ -100,8 +100,8 @@ class InstallData: stat.S_ISBLK(os.stat("/dev/live")[stat.ST_MODE]): target = os.readlink("/dev/live") self.partitions.protected = [target] - elif self.anaconda._loaderMethodstr.startswith("hd://"): - method = self.anaconda._loaderMethodstr[5:] + elif self.anaconda._loaderMethodstr.startswith("hd:"): + method = self.anaconda._loaderMethodstr[3:] device = method.split(":", 3)[0] self.partitions.protected = [device] @@ -199,8 +199,6 @@ class InstallData: self.rootPassword["lock"], algo=self.getPassAlgo()) - self.users.reset() - if self.anaconda.isKickstart: for svc in self.ksdata.services.disabled: iutil.execWithRedirect("/sbin/chkconfig", |