This is a usability improvment. Once you've booted up the kernel and
initrd on s390x, you are told to ssh in to the host to start the
installation. In the past, we had rigged the root account to launch
loader on the first login and a shell on subsequent logins. In this
patch, I've added an 'install' user that has loader for the shell. The
root user still has bash for the shell. Also change the recommendation
to run 'ssh -X' rather than 'ssh -x'.
---
loader/linuxrc.s390 | 5 ++---
scripts/mk-images | 10 +++++++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
index 53ce90d..c6efbe4 100644
--- a/loader/linuxrc.s390
+++ b/loader/linuxrc.s390
@@ -129,9 +129,8 @@ function startinetd()
/sbin/sshd
if [ -z "$RUNKS" ]; then
echo
- echo $"Connect now to $IPADDR and login as user root to start the installation."
- echo $"E.g. using: ssh -x root@$IPADDR"
- echo $"After login, please start the installation using: loader"
+ echo $"Connect now to $IPADDR and login as user install to start the installation."
+ echo $"E.g. using: ssh -X install@$IPADDR"
read
while : ; do
/bin/sh --login
diff --git a/scripts/mk-images b/scripts/mk-images
index 26d3a43..68760d1 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -408,9 +408,13 @@ instbin() {
setupShellEnvironment() {
echo "tcp 6 TCP" > $MBD_DIR/etc/protocols
- cat > $MBD_DIR/etc/shadow << EOF
-root::14438:0:99999:7:::
-EOF
+ # enable root shell logins
+ echo "root::14438:0:99999:7:::" >> $MBD_DIR/etc/shadow
+
+ # enable 'install' account that starts anaconda on login
+ echo "install:x:0:0:root:/root:/sbin/loader" >> $MBD_DIR/etc/passwd
+ echo "install::14438:0:99999:7:::" >> $MBD_DIR/etc/shadow
+
chmod 0400 $MBD_DIR/etc/shadow
# PAM configuration
--
1.6.2.5
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
