From 79fd57eb24308437b0d1c91aae9639b10b94a038 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 3 Oct 2019 19:02:22 +0530 Subject: [PATCH] Format lists better on github --- bypy/README.rst | 97 +++++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 44 deletions(-) diff --git a/bypy/README.rst b/bypy/README.rst index 66fe46d8e7..1aba482535 100644 --- a/bypy/README.rst +++ b/bypy/README.rst @@ -47,11 +47,11 @@ You need a VirtualBox virtual machine of macOS 10.14 (Mojave). Name the VM using ``vm_name`` from :literal:`bypy/macos.conf`. To setup macOS inside the VM, follow the steps: - * Turn on Remote Login under Network (SSHD) - * Create a user account named ``kovid`` and enable password-less login for SSH - for that account (setup `~/.ssh/authorized_keys`) - * Setup ssh into the VM from the host using the ``vm_name`` from above. - * Install the needed software mentioned in :literal:`bypy/macos.conf`. +* Turn on Remote Login under Network (SSHD) +* Create a user account named ``kovid`` and enable password-less login for SSH + for that account (setup `~/.ssh/authorized_keys`) +* Setup ssh into the VM from the host using the ``vm_name`` from above. +* Install the needed software mentioned in :literal:`bypy/macos.conf`. To build the dependencies for calibre, run:: @@ -72,47 +72,56 @@ You need a VirtualBox virtual machine of Windows 7 64bit. Name the VM using ``vm_name`` from :literal:`bypy/windows.conf`. To setup windows inside the VM, follow the steps: - * Install all the software mentioned in :literal:`bypy/windows.conf` - * Install cygwin, with the: vim, dos2unix, rsync, openssh, unzip, wget, make, zsh, patch, bash-completion, curl - packages - * Edit /etc/passwd and replace all occurrences of /bin/bash with /bin/zsh (in - a cygwin prompt) - * Setup a password for your windows user account - * Follow the steps here: - http://pcsupport.about.com/od/windows7/ht/auto-logon-windows-7.htm to allow the - machine to bootup without having to enter the password +* Install all the software mentioned in :literal:`bypy/windows.conf` - * The following steps must all be run in an administrator cygwin shell, to - enable SSH logins to the machine +* Install cygwin, with the: vim, dos2unix, rsync, openssh, unzip, wget, make, zsh, patch, bash-completion, curl + packages + +* Edit /etc/passwd and replace all occurrences of /bin/bash with /bin/zsh (in + a cygwin prompt) + +* Setup a password for your windows user account + +* Follow the steps here: http://pcsupport.about.com/od/windows7/ht/auto-logon-windows-7.htm to allow the + machine to bootup without having to enter the password + +* The following steps must all be run in an administrator cygwin shell, to + enable SSH logins to the machine + +* First clean out any existing cygwin ssh setup with:: + net stop sshd + cygrunsrv -R sshd + net user sshd /DELETE + net user cyg_server /DELETE (delete any other cygwin users account you + can list them with net user) + rm -R /etc/ssh* + mkpasswd -cl > /etc/passwd + mkgroup --local > /etc/group + +* Assign the necessary rights to the normal user account (administrator + cygwin command prompt needed - editrights is available in \cygwin\bin):: + editrights.exe -a SeAssignPrimaryTokenPrivilege -u kovid + editrights.exe -a SeCreateTokenPrivilege -u kovid + editrights.exe -a SeTcbPrivilege -u kovid + editrights.exe -a SeServiceLogonRight -u kovid + +* Run:: + ssh-host-config + And answer (yes) to all questions. If it asks do you want to use a + different user name, specify the name of your user account and enter + username and password + +* On Windows XP, I also had to run:: + passwd -R + to allow sshd to use my normal user account even with public key + authentication. See http://cygwin.com/cygwin-ug-net/ntsec.html for + details. On Windows 7 this wasn't necessary for some reason. + +* Start sshd with:: + net start sshd + +* See http://www.kgx.net.nz/2010/03/cygwin-sshd-and-windows-7/ for details - * First clean out any existing cygwin ssh setup with:: - net stop sshd - cygrunsrv -R sshd - net user sshd /DELETE - net user cyg_server /DELETE (delete any other cygwin users account you - can list them with net user) - rm -R /etc/ssh* - mkpasswd -cl > /etc/passwd - mkgroup --local > /etc/group - * Assign the necessary rights to the normal user account (administrator - cygwin command prompt needed - editrights is available in \cygwin\bin):: - editrights.exe -a SeAssignPrimaryTokenPrivilege -u kovid - editrights.exe -a SeCreateTokenPrivilege -u kovid - editrights.exe -a SeTcbPrivilege -u kovid - editrights.exe -a SeServiceLogonRight -u kovid - * Run:: - ssh-host-config - And answer (yes) to all questions. If it asks do you want to use a - different user name, specify the name of your user account and enter - username and password - * On Windows XP, I also had to run:: - passwd -R - to allow sshd to use my normal user account even with public key - authentication. See http://cygwin.com/cygwin-ug-net/ntsec.html for - details. On Windows 7 this wasn't necessary for some reason. - * Start sshd with:: - net start sshd - * See http://www.kgx.net.nz/2010/03/cygwin-sshd-and-windows-7/ for details To build the dependencies for calibre, run::