diff options
| author | Chris Lumens <clumens@redhat.com> | 2012-08-07 13:56:54 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2012-08-08 11:36:01 -0400 |
| commit | 982be725ea027fbf066c934e9526b09b35583389 (patch) | |
| tree | 925985dbe87f15d9d7142d1fa018627e5318f7a8 | |
| parent | a8df1399a4226e714cace995c2e44df680d035c8 (diff) | |
| download | anaconda-982be725ea027fbf066c934e9526b09b35583389.tar.gz anaconda-982be725ea027fbf066c934e9526b09b35583389.tar.xz anaconda-982be725ea027fbf066c934e9526b09b35583389.zip | |
On interactive installs, default the root account to locked.
It's up to firstboot to set up the first user as the admin. Or, the user
can go through with a kickstart install.
This requires an updated version of pykickstart that understands the rootpw
command doesn't need a password argument if it's just going to lock the
account.
| -rw-r--r-- | anaconda.spec.in | 2 | ||||
| -rw-r--r-- | data/interactive-defaults.ks | 1 | ||||
| -rw-r--r-- | pyanaconda/kickstart.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/anaconda.spec.in b/anaconda.spec.in index 4563c7e6e..7deffe3ec 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -26,7 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define intltoolver 0.31.2-3 %define libnlver 1.0 %define libselinuxver 1.6 -%define pykickstartver 1.99.14 +%define pykickstartver 1.99.15 %define rpmpythonver 4.2-0.61 %define slangver 2.0.6-2 %define yumver 2.9.2 diff --git a/data/interactive-defaults.ks b/data/interactive-defaults.ks index f692ccdc8..0046cc3f2 100644 --- a/data/interactive-defaults.ks +++ b/data/interactive-defaults.ks @@ -2,3 +2,4 @@ # This is not loaded if a kickstart file is provided on the command line. auth --enableshadow --passalgo=sha512 firstboot --enable +rootpw --lock diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 7c3baa2c1..0c4d802d8 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -1212,7 +1212,7 @@ class RaidData(commands.raid.F15_RaidData): parents=request) storage.createDevice(luksdev) -class RootPw(commands.rootpw.F8_RootPw): +class RootPw(commands.rootpw.F18_RootPw): def execute(self, storage, ksdata, instClass, users): algo = users.getPassAlgo(ksdata.authconfig.authconfig) users.setRootPassword(self.password, self.isCrypted, self.lock, algo) |