kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

Fix advice/advise typos.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2016-08-27 21:30:30 +02:00
parent c195784736
commit 967c5b57d5
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/porting-guide
View file

@ -307,7 +307,7 @@ you will have to implement features in Sortix or add some compatibility. Other
times, you can work around the build system or patch the software. times, you can work around the build system or patch the software.
Try ask around and examine other archived port tixes and see their patches Try ask around and examine other archived port tixes and see their patches
reveal any useful advise on how to resolve the situation: reveal any useful advice on how to resolve the situation:
Here is a list of common problems: Here is a list of common problems:
@ -476,5 +476,5 @@ This should be a basic walk-through the process of porting a piece of software
to the Sortix operating system. Note how the porting facilities are experimental to the Sortix operating system. Note how the porting facilities are experimental
and much is subject to change in the near future. Porting software is an and much is subject to change in the near future. Porting software is an
advanced topic and this documentation merely touches the more common situations advanced topic and this documentation merely touches the more common situations
and surely important advise is missing from this documentation. It's always a and surely important advice is missing from this documentation. It's always a
good idea to consult the Sortix developers for advise. good idea to consult the Sortix developers for advice.

12
sysinstall/sysinstall.c
View file

@ -324,7 +324,7 @@ int main(void)
text("You are about to install a new operating system on this computer. " text("You are about to install a new operating system on this computer. "
"This is not something you should do on a whim or when you are " "This is not something you should do on a whim or when you are "
"impatient. Take the time to read the documentation and be patient " "impatient. Take the time to read the documentation and be patient "
"while you learn the new system. This is a very good time to start an " "while you learn the new system. This is a very good time to start an "
"external music player that plays soothing classical music on loop.\n\n"); "external music player that plays soothing classical music on loop.\n\n");
const char* readies[] = const char* readies[] =
@ -557,7 +557,7 @@ int main(void)
"Type mkpart to make a new partition. " "Type mkpart to make a new partition. "
"Type mount 2 / to create a mountpoint for partition 2. " "Type mount 2 / to create a mountpoint for partition 2. "
"Type exit when done. " "Type exit when done. "
"There is partitioning advise in installation(7). " "There is partitioning advice in installation(7). "
"Type man 8 disked to display the disked(8) man page.\n", "Type man 8 disked to display the disked(8) man page.\n",
mktable_tip); mktable_tip);
struct filesystem* root_filesystem = NULL; struct filesystem* root_filesystem = NULL;
@ -636,7 +636,7 @@ int main(void)
while ( true ) while ( true )
{ {
prompt(return_to_disked, sizeof(return_to_disked), prompt(return_to_disked, sizeof(return_to_disked),
"Return to disked to make a BIOS boot partition?", "yes"); "Return to disked to make a BIOS boot partition?", "yes");
if ( strcasecmp(accept_grub, "no") == 0 || if ( strcasecmp(accept_grub, "no") == 0 ||
strcasecmp(accept_grub, "yes") == 0 ) strcasecmp(accept_grub, "yes") == 0 )
break; break;
@ -739,7 +739,7 @@ int main(void)
umask(0022); umask(0022);
if ( access("tix/collection.conf", F_OK) < 0 ) if ( access("tix/collection.conf", F_OK) < 0 )
execute((const char*[]) { "tix-collection", ".", "create", execute((const char*[]) { "tix-collection", ".", "create",
"--prefix=", NULL }, "_e"); "--prefix=", NULL }, "_e");
install_manifest("system", "", "."); install_manifest("system", "", ".");
// TODO: Preserve the existing /src if it exists like in sysupgrade. // TODO: Preserve the existing /src if it exists like in sysupgrade.
if ( has_manifest("src") ) if ( has_manifest("src") )
@ -909,7 +909,7 @@ int main(void)
{ {
char answer[32]; char answer[32];
prompt(answer, sizeof(answer), prompt(answer, sizeof(answer),
"Empty password is stupid, are you sure? (yes/no)", "no"); "Empty password is stupid, are you sure? (yes/no)", "no");
if ( strcasecmp(answer, "yes") != 0 ) if ( strcasecmp(answer, "yes") != 0 )
continue; continue;
} }
@ -925,7 +925,7 @@ int main(void)
explicit_bzero(first, sizeof(first)); explicit_bzero(first, sizeof(first));
if ( !install_configurationf("etc/passwd", "a", if ( !install_configurationf("etc/passwd", "a",
"%s:%s:%" PRIuUID ":%" PRIuGID ":%s:/home/%s:sh\n", "%s:%s:%" PRIuUID ":%" PRIuGID ":%s:/home/%s:sh\n",
user, hash, uid, gid, name, user) ) user, hash, uid, gid, name, user) )
continue; continue;
if ( !install_configurationf("etc/group", "a", if ( !install_configurationf("etc/group", "a",
"%s::%" PRIuGID ":%s\n", user, gid, user) ) "%s::%" PRIuGID ":%s\n", user, gid, user) )