Skip to content

S
slapos.package
Commit 3287c5c5 authored by Jondy Zhao's avatar Jondy Zhao
Browse files
Options

Merge remote-tracking branch 'origin/cygwin-1.0-typos' into cygwin

parents 3ed96087 4cb5eb20
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 95 deletions
windows/babeld/cyginet.c
View file @ 3287c5c5
......@@ -172,7 +172,7 @@ static int
get_interface_forwards(char * guid)
{
long value = 0;
/* Location in the Windows XP, not sure in Vista or Windows 7 */
/* Location in Windows XP, not sure in Vista or Windows 7 */
char * key = "SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters"
"\\Interfaces\\%s";
char * name = "Forwards";
......@@ -449,7 +449,7 @@ libwinet_run_command(const char *command)
*
* Gateway could be an address or interface name.
*
* In the Windows 7, there is a little difference:
* In Windows 7, there is a little difference:
*
* Destination Prefix: ::/0
* Source Prefix: ::/0
......@@ -510,7 +510,7 @@ libwinet_dump_ipv6_route_table(struct cyginet_route *routes,
*p -- = 0;
/* The first field of route entry
In the Windows XP, field name is "prefix",
In Windows XP, field name is "prefix",
Windows 7, "Destination Prefix"
*/
if ((strncmp(buffer, "Prefix", 6) == 0) ||
......@@ -1091,7 +1091,7 @@ libwinet_edit_route_entry(const struct sockaddr *dest,
memset(&Row2, 0, sizeof(MIB_IPFORWARD_ROW2));
/* Row2.InterfaceLuid = 0; */
/* Maybe in the Vista, both of indexs are same. */
/* Maybe in Vista, both indexes are the same. */
Row2.InterfaceIndex = dest->sa_family == AF_INET6 ?
ifindex : libwinet_map_ifindex(AF_INET6, ifindex);
Row2.DestinationPrefix.PrefixLength = plen;
......@@ -1571,7 +1571,7 @@ cyginet_getifaddresses(char *ifname,
return dwReturn;
}
/* In the windows, loopback interface index is alawys 1 */
/* In windows, loopback interface index is alawys 1 */
int
cyginet_loopback_index(int family)
{
......@@ -1579,7 +1579,7 @@ cyginet_loopback_index(int family)
}
/*
* There are 3 ways to dump route table in the Windows:
* There are 3 ways to dump route table in Windows:
*
* Before Windows Vista
*
......@@ -2675,7 +2675,7 @@ VOID PrintAllInterfaces()
static void
runTestCases()
{
printf("\n\nTest getifaddrs works in the Cygwin:\n\n");
printf("\n\nTest getifaddrs works in Cygwin:\n\n");
{
struct ifaddrs * piftable, *pif;
getifaddrs(&piftable);
......@@ -2684,7 +2684,7 @@ runTestCases()
freeifaddrs(piftable);
}
printf("\n\nTest if_indexname works in the Cygwin:\n\n");
printf("\n\nTest if_indexname works in Cygwin:\n\n");
{
struct if_nameindex * ptr = (struct if_nameindex *)if_nameindex();
if (ptr) {
......@@ -2697,7 +2697,7 @@ runTestCases()
}
}
printf("\n\nTest if_indextoname works in the Cygwin:\n\n");
printf("\n\nTest if_indextoname works in Cygwin:\n\n");
{
CHAR ifname[256];
if (if_indextoname(1, ifname))
......@@ -2706,7 +2706,7 @@ runTestCases()
printf("if_indextoname failed\n");
}
printf("\n\nTest cyginet_ifname works in the Cygwin:\n\n");
printf("\n\nTest cyginet_ifname works in Cygwin:\n\n");
{
struct if_nameindex * ptr = (struct if_nameindex *)if_nameindex();
if (ptr) {
......@@ -2728,7 +2728,7 @@ runTestCases()
);
}
*/
printf("\n\nTest cyginet_guidname works in the Cygwin:\n\n");
printf("\n\nTest cyginet_guidname works in Cygwin:\n\n");
{
PLIBWINET_INTERFACE_MAP_TABLE p = g_interface_map_table;
while (p) {
......
windows/babeld/cyginet.h
View file @ 3287c5c5
......@@ -92,7 +92,7 @@
http://msdn.microsoft.com/en-us/library/aa921042.aspx
TCP/IP (v4 and v6) Technical Reference, it shows ipv4 and ipv6 how
to work in the windows. (Recommended)
to work in windows. (Recommended)
http://technet.microsoft.com/en-us/library/dd379473(v=ws.10).aspx
*/
......@@ -103,7 +103,7 @@
#define IN_LOOPBACK(a) ((((long int) (a)) & 0xff000000) == 0x7f000000)
#endif
/* Missing defines in the Cygwin */
/* Missing defines in Cygwin */
#define RTM_ADD 0x1 /* Add Route */
#define RTM_DELETE 0x2 /* Delete Route */
#define RTM_CHANGE 0x3 /* Change Metrics or flags */
......
windows/babeld/kernel_cygwin.c
View file @ 3287c5c5
......@@ -101,7 +101,7 @@ static int kernel_pipe_handles[2];
* forward- ing of IPv6 packets. Also, identify if the node is
* acting as a router. Defaults to off.
*
* ==> In the Windows, MSDN says in the registry
* ==> In Windows, MSDN says in the registry
*
* HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters
*
......@@ -156,7 +156,7 @@ kernel_setup(int setup)
if (0 != cyginet_startup())
return -1;
/* We don't disable ICMPv6 redirect in the Windows */
/* We don't disable ICMPv6 redirect in Windows */
/*
if ((rc = cyginet_set_icmp6_redirect_accept(0)) == -1) {
fprintf(stderr, "Cannot disable ICMPv6 redirect.\n");
......@@ -288,7 +288,7 @@ clear_kernel_socket_event()
*
* RTF_CLONING: generate new routes on use
*
* Not implemented in the Windows.
* Not implemented in Windows.
*
*/
int
......@@ -564,7 +564,7 @@ kernel_routes(struct kernel_route *routes, int maxroutes)
}
/* Note: ifname returned by getifaddrs maybe includes a suffix number
in the Cygwin, it looks like:
in Cygwin, it looks like:
{C05BAB6E-B82D-4C4D-AF07-EFF7C45C5DB0}_1
{C05BAB6E-B82D-4C4D-AF07-EFF7C45C5DB0}_2
......@@ -697,7 +697,7 @@ kernel_callback(int (*fn)(int, void*), void *closure)
{
if (kernel_socket < 0) kernel_setup_socket(1);
/* In the Windows, we can't get the exact changed route, but the
/* In Windows, we can't get the exact changed route, but the
route table is really changed. */
kdebugf("Kernel table changed.\n");
cyginet_refresh_interface_table();
......
windows/babeld/net.c
View file @ 3287c5c5
......@@ -51,7 +51,7 @@ babel_socket(int port)
/* When this value is nonzero (the default on Windows), a socket
created for the AF_INET6 address family can be used to send and
receive IPv6 packets only. So it's not require to set in the
receive IPv6 packets only. So it's not required to set in
Windows XP. Actualy, this socket option is only supported on
Windows Vista or later. */
#if !defined(_WIN32_WINNT) || _WIN32_WINNT >= 0x0600
......
windows/docs/using-slapos-in-windows.html
View file @ 3287c5c5
This diff is collapsed.
windows/docs/using-slapos-in-windows.xml
View file @ 3287c5c5
......@@ -12,7 +12,7 @@
<revnumber>0.4</revnumber>
<date>2013-08-01</date>
<authorinitials>Jondy Zhao - jondy.zhao@nexedi.com</authorinitials>
<revremark>Add chapter Create SlapOS Windows Installer Bootstrip Node.</revremark>
<revremark>Add chapter Create SlapOS Windows Installer Bootstrap Node.</revremark>
</revision>
<revision>
......@@ -126,7 +126,7 @@ Then waiting for configure script finished. Be sure the configure scrip report s
<section><title>Command Console</title>
<para>It will open a terminal, here you can run most of slapos command, for examples,
<programlisting>
slapos node foramt -cv --now
slapos node format -cv --now
slapos supply slaprunner COMP-1658
slapos request "Jondy Web Runner In Windows 7" slaposwebrunner --node computer_guid=COMP-1658
slapos node software
......@@ -138,7 +138,7 @@ slapos node status
</section>
<section><title>User Guide</title>
<para>It just showes this documnet in the web browser.</para>
<para>It just shows this documnet in the web browser.</para>
</section>
<section><title>Cron Service</title>
......@@ -486,19 +486,19 @@ Then upload the source packages dist/psutil-1.0.1.tar.gz to http://www.nexedi.or
</section>
</chapter>
<chapter><title>Create SlapOS Windows Installer Bootstrip Node</title>
<chapter><title>Create SlapOS Windows Installer Bootstrap Node</title>
<para>This chapter descripts how to create a slapos node in the windows which used to test the windows installer self:
<itemizedlist>
<listitem><para>Install cygwin</para></listitem>
<listitem><para>Prepare certificate, key, computer.key, computer.crt and test-computer.key, test-computer.crt</para></listitem>
<listitem><para>Run slapos-cygwin-bootstrip.sh, got it from slapos.package.git/windows/scripts</para></listitem>
<listitem><para>Run slapos-cygwin-bootstrap.sh, got it from slapos.package.git/windows/scripts</para></listitem>
<listitem><para>Run command slapos node software/release until instance created</para></listitem>
<listitem><para>Run command slapos remove to destroy this instance</para></listitem>
</itemizedlist>
</para>
<section><title>Add SlapOS Bootstrip Node to Vifib Cluster</title>
<para>Create an instance of SlapOS Test-Agent in slapos bootstrip node (computer.key/computer.crt), it will test the software: http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/slapos-windows-installer/software.cfg, this software can build slapos windows installer, then run the installer to create a slapos test node.</para>
<section><title>Add SlapOS Bootstrap Node to Vifib Cluster</title>
<para>Create an instance of SlapOS Test-Agent in slapos bootstrap node (computer.key/computer.crt), it will test the software: http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/slapos-windows-installer/software.cfg, this software can build slapos windows installer, then run the installer to create a slapos test node.</para>
<para>Create another instance of SlapOS Test-Agent used to test the instances running in the slapos test node (test-computer.key/test-computer.crt). This test agent can include any software which can run in the slapos windows.</para>
</section>
</chapter>
......
windows/ipwin/ipwin/ReadMe.txt
View file @ 3287c5c5
How to build for x86:
Open ipwin.vcproj in the Microsoft Visual Studio 2008, Press F7
Open ipwin.vcproj in Microsoft Visual Studio 2008, Press F7
How to build for x64:
......
windows/ipwin/ipwin/netcfg.cpp
View file @ 3287c5c5
......@@ -429,7 +429,7 @@ HRESULT SlaposNetCfgWinRenameConnection (LPWSTR pGuid, PCWSTR NewName)
lpHrRenameConnection RenameConnectionFunc = NULL;
HRESULT status;
/* First try the IShellFolder interface, which was unimplemented
/* First try the IShellFolder interface, which was not implemented
* for the network connections folder before XP. */
status = rename_shellfolder (pGuid, NewName);
if (status == E_NOTIMPL)
......
windows/netreport/setup.py
View file @ 3287c5c5
......@@ -39,7 +39,7 @@ def main():
setup_args = dict(
name='netdrive',
version=VERSION,
description='A tool used to report the usage of net drive in the Windows',
description='A tool used to report the usage of net drive in Windows',
long_description=get_description(),
keywords=['netdrive',],
py_modules=['netreport'],
......
windows/netreport/src/netuse.c
View file @ 3287c5c5
......@@ -91,21 +91,21 @@ netuse_user_info(PyObject *self, PyObject *args)
logonuser = userinfo;
len = wchar2mchar(pBuf->wkui1_username, logonuser, size);
if (len == -1) {
PyErr_SetString(PyExc_RuntimeError, "Unicode convertion error");
PyErr_SetString(PyExc_RuntimeError, "Unicode conversion error");
return NULL;
}
size -= len;
logondomain = logonuser + len;
len = wchar2mchar(pBuf->wkui1_logon_domain, logondomain, size);
if (len == -1) {
PyErr_SetString(PyExc_RuntimeError, "Unicode convertion error");
PyErr_SetString(PyExc_RuntimeError, "Unicode conversion error");
return NULL;
}
size -= len;
logonserver = logondomain + len;
len = wchar2mchar(pBuf->wkui1_logon_server, logonserver, size);
if (len == -1) {
PyErr_SetString(PyExc_RuntimeError, "Unicode convertion error");
PyErr_SetString(PyExc_RuntimeError, "Unicode conversion error");
return NULL;
}
}
......@@ -163,7 +163,7 @@ netuse_map_drive(PyObject *self, PyObject *args)
drive[0] = get_free_drive_letter();
if (!drive[0]) {
PyErr_SetString(PyExc_RuntimeError,
"Add net drive faild: no available drive letter."
"Add net drive failed: no available drive letter."
);
return NULL;
}
......@@ -403,7 +403,7 @@ PyMODINIT_FUNC initnetuse(void)
PyObject* module;
module = Py_InitModule3("netuse",
NetUseMethods,
"Show information about net resource in the Windows."
"Show information about net resource in Windows."
);
if (module == NULL)
......
windows/scripts/ip
View file @ 3287c5c5
......@@ -25,8 +25,8 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# ------------------------------------------------------------------------------
# Simulate the linux command "ip" in the Windows. Most of functions
# are mapped to windows command "netsh". Refer to ip man in the linux
# Simulate the linux command "ip" in Windows. Most of functions
# are mapped to windows command "netsh". Refer to ip man in linux
# to know how to use this command.
#
# Synopsis (not all of options are implemented here),
......@@ -408,7 +408,7 @@ while [[ "$1" != "" ]] && [[ "$object" == "" ]] ; do
maddr | mroute | monitor | tuntap | vpntap)
object=$1
;;
*) echo Warning: unsupport options "$1"
*) echo Warning: unsupported options "$1"
esac
shift
......@@ -428,7 +428,7 @@ fi
command=$1; shift
if [[ "$command" == "" ]] ; then
echo $orig_cmd
echo "Error: missing command paramter."
echo "Error: missing command parameter."
exit 1
fi
......@@ -468,7 +468,7 @@ elif [[ $object == "addr" ]] ; then
dev=$(format_interface_name "$2")
shift
;;
*) echo Warning: unsupport parameter "$1"
*) echo Warning: unsupported parameter "$1"
esac
shift
......@@ -601,7 +601,7 @@ elif [[ $object == "route" ]] ; then
table="$2"
shift
;;
*) echo "Warning: unsupport parameter \"$1\" in the Cygwin"
*) echo "Warning: unsupported parameter \"$1\" in Cygwin"
esac
shift;
......@@ -610,7 +610,7 @@ elif [[ $object == "route" ]] ; then
if [[ "$unreachable" == "1" ]] ; then
if [[ "$opt_family" == "ipv4" || "$opt_family" == "" ]] ; then
echo $orig_cmd
echo "Error: unreachable ipv4 route entry is unimplemented"
echo "Error: unreachable ipv4 route entry is not implemented"
exit 1
else
if [[ "$command" == "del" ]] ; then
......@@ -671,7 +671,7 @@ elif [[ $object == "vpntap" || $object == "tuntap" ]] ; then
mode=$2
shift
;;
*) echo Warning: unsupport parameter "$1"
*) echo Warning: unsupported parameter "$1"
esac
shift
......@@ -689,26 +689,26 @@ elif [[ $object == "vpntap" || $object == "tuntap" ]] ; then
exit 1
fi
# elif [[ $object == "rule" ]] ; then
# echo "Error: unsupported ip object \"$object\" in the Cygwin"
# echo "Error: unsupported ip object \"$object\" in Cygwin"
# exit 1
# elif [[ $object == "neigh" ]] ; then
# echo "Error: unsupported ip object \"$object\" in the Cygwin"
# echo "Error: unsupported ip object \"$object\" in Cygwin"
# exit 1
# elif [[ $object == "tunnel" ]] ; then
# echo "Error: unsupported ip object \"$object\" in the Cygwin"
# echo "Error: unsupported ip object \"$object\" in Cygwin"
# exit 1
# elif [[ $object == "maddr" ]] ; then
# echo "Error: unsupported ip object \"$object\" in the Cygwin"
# echo "Error: unsupported ip object \"$object\" in Cygwin"
# exit 1
# elif [[ $object == "mroute" ]] ; then
# echo "Error: unsupported ip object \"$object\" in the Cygwin"
# echo "Error: unsupported ip object \"$object\" in Cygwin"
# exit 1
# elif [[ $object == "monitor" ]] ; then
# echo "Error: unsupported ip object \"$object\" in the Cygwin"
# echo "Error: unsupported ip object \"$object\" in Cygwin"
# exit 1
else
echo $orig_cmd
echo "Error: unsupported ip object \"$object\" in the Cygwin"
echo "Error: unsupported ip object \"$object\" in Cygwin"
exit 1
fi
......
windows/scripts/register-node.sh
View file @ 3287c5c5
......@@ -90,9 +90,9 @@ if [[ ! -d ~/.slapos ]] ; then
fi
if [[ ! ( -f ~/.slapos/certificate && -f ~/.slapos/key ) ]] ; then
echo "Error: missing certificate and key in the ~/.slapos \
echo "Error: missing certificate and key in ~/.slapos \
If you haven't an account in the slapos.org, please login https://www.slapos.org and signup. Otherwise to be sure both of files are stored in the ~/.slapos
If you don't have an account in slapos.org, please login to https://www.slapos.org and signup. Otherwise check that both files are stored in ~/.slapos
"
exit 1
fi
......@@ -105,7 +105,7 @@ master_url = https://slap.vifib.com/
[slapconsole]
# Put here retrieved certificate from vifib.
# Beware: put certificate from YOUR account, not the one from your node.
# You (as identified person from vifib) will request an instance, node your node.
# You (as identified person from vifib) will request an instance, not your node.
# Conclusion: node certificate != person certificate.
cert_file = ~/.slapos/certificate
key_file = ~/.slapos/key
......@@ -126,18 +126,18 @@ bin/slapos node register $nodename
# Check computer configure file: /etc/opt/slapos/slapos.cfg
nodecfg=/etc/opt/slapos/slapos.cfg
if [[ ! -f $nodecfg ]] ; then
echo Error: something is wrong when register node. Can not find the configure file $nodecfg.
echo Error: something is wrong when registering the node. Cannot find the configuration file $nodecfg.
exit 1
fi
# check ipv6
netsh interface ipv6 show interface > /dev/null || netsh interface ipv6 install
# get GUID of the first physics netcard
# get GUID of the first physical netcard
guidname=get_all_physical_netcard
if [[ "$guidname" == "" ]] ; then
echo Error: no any physical netcard found.
echo Error: no physical netcard found.
exit 1
fi
......@@ -150,9 +150,9 @@ sed -i -e "s/^\\s*interface_name.*$/interface_name = ${IPINTERFACE}/g" \
$nodecfg
#
# Add run item when windows startup
# Add run item at windows startup
echo Set slapos init script as Windows startup item.
regtool -q set "$RUNKEY\\$SLAPOSNODEINIT" "\"$(cygpath -w /usr/bin/sh)\" --login -i /etc/slapos/scripts/init-slapos-node.sh"
(( $? )) && echo Fail to set init script as startup item.
(( $? )) && echo Failed to set init script as startup item.
windows/scripts/slap-runner.html
View file @ 3287c5c5
<html>
<head><title>SlapOS Webrunner</title></head>
<body>Sorry, SlapOS Web Runner isn't installed now. Please run SlapOS Node at first by clicking Start -> SlapOS -> SlapOS Node. Be sure to run it as Administrator in the Windows 7.</body>
<body>Sorry, SlapOS Web Runner is not installed now. Please run SlapOS Node first by clicking Start -> SlapOS -> SlapOS Node. Be sure to run it as Administrator in Windows 7.</body>
</html>
windows/scripts/slapos-configure.sh
View file @ 3287c5c5
......@@ -51,7 +51,7 @@ function show_usage()
echo " The configure item option:"
echo ""
echo " * All the configure item"
echo " re6stnet Install re6stent and dependencies"
echo " re6stnet Install re6stnet and dependencies"
echo " config Generate slapos node and client configure files"
echo " cron Generate cron file and start cron job"
echo ""
......@@ -155,7 +155,7 @@ mkdir -p /etc/re6stnet
# -----------------------------------------------------------
# Create account: slaproot
# -----------------------------------------------------------
# Start seclogon service in the Windows XP
# Start seclogon service in Windows XP
if csih_is_xp ; then
csih_inform "Set start property of seclogon to auto"
sc config seclogon start= auto ||
......@@ -342,7 +342,7 @@ csih_inform " user_base_name: ${slapos_user_basename}"
csih_inform
csih_inform " If ipv4_local_network confilcts with your local network, change it"
csih_inform " in the file: ${node_configure_file} "
csih_inform " Or change it in the $(dirname $0)/slapos-include.sh"
csih_inform " Or change it in $(dirname $0)/slapos-include.sh"
csih_inform " and run Configure SlapOS again."
sed -i -e "s%^\\s*interface_name.*$%interface_name = ${interface_guid}%" \
......@@ -518,7 +518,7 @@ if check_re6stnet_needed ; then
-u ${_administrator} -w ${csih_PRIVILEGED_PASSWORD} ||
csih_error "Failed to install ${re6stnet_service_name} service."
fi
csih_inform "you can check log files in the /var/log/re6stnet/*.log"
csih_inform "you can check log files in /var/log/re6stnet/*.log"
if ! check_cygwin_service ${re6stnet_service_name} ; then
csih_inform "Service ${re6stnet_service_name} is not running. One possible case"
csih_inform "is that re6stnet service is shutdown in unusual ways, in this case"
......@@ -596,7 +596,7 @@ echo ""
# echo
echo ""
csih_inform "Configure SlapOS successfully"
csih_inform "SlapOS has been successfully configured"
echo ""
read -n 1 -t 60 -p "Press any key to exit..."
......
windows/scripts/slapos-cron-config
View file @ 3287c5c5
......@@ -148,8 +148,8 @@ get_NT() {
# ======================================================================
warning_for_etc_file() {
echo
echo "WARNING: The command above overwrites any existing /etc/$1."
echo "You may want to preserve /etc/$1 before generating a new,"
echo "WARNING: The above command overwrites any existing /etc/$1."
echo "You may want to preserve /etc/$1 before generating a new"
echo "one, and then compare your saved /etc/$1 file with the"
echo "newly-generated one in case you need to restore other"
echo "entries."
......@@ -590,13 +590,13 @@ create_user() {
else
username_in_sam=
echo "User ${username} needs a password. It must match"
echo "the rules in force on your system."
echo "the rules enforced by your system."
getvalue "Please enter the password for ${username}:" -s
_password="${value}"
echo
net user "${username}" "${_password}" /add /fullname:"Privileged server" /yes > "$TEMP_FILE" 2>&1 && username_in_sam=yes
if [ "${username_in_sam}" != "yes" ]; then
echo "ERROR: Creating the user '${username}' failed! Reason:"
echo "ERROR: Creation of user '${username}' failed! Reason:"
cat "$TEMP_FILE"
rm -f "$TEMP_FILE"
echo
......
windows/scripts/slapos-cygwin-bootstrip.sh → windows/scripts/slapos-cygwin-bootstrap.sh
View file @ 3287c5c5
......@@ -8,16 +8,16 @@ readonly -f check_os_is_wow64
function show_usage()
{
echo "This script is used to build a bootstrip slapos in the cywin."
echo "This script is used to build a bootstrap slapos in cywin."
echo ""
echo "Usage:"
echo ""
echo " ./slapos-cygwin-bootstrip.sh"
echo " ./slapos-cygwin-bootstrap.sh"
echo ""
echo "Before run this script, type the following command in the windows"
echo "command console to install cygwin:"
echo ""
echo " setup_cygwin.bat C:\slapos-bootstrip network"
echo " setup_cygwin.bat C:\slapos-bootstrap network"
echo ""
echo "Then sign up slapos.org, got the following certificate files:"
echo ""
......@@ -43,7 +43,7 @@ if ! source /usr/share/csih/cygwin-service-installation-helper.sh ; then
exit 1
fi
csih_inform "Starting bootstrip slapos node ..."
csih_inform "Starting bootstrap slapos node ..."
echo ""
# ======================================================================
......@@ -277,7 +277,7 @@ echo ""
# -----------------------------------------------------------
# Format slapos node
# -----------------------------------------------------------
csih_inform "Formating SlapOS Node ..."
csih_inform "Formatting SlapOS Node ..."
netsh interface ipv6 add addr ${slapos_ifname} ${ipv6_local_address}
/opt/slapos/bin/slapos node format -cv --now ||
......@@ -319,7 +319,7 @@ while true ; do
done
echo ""
csih_inform "Bootstrip slapos node successfully."
csih_inform "Bootstrap slapos node successfully."
echo ""
read -n 1 -t 60 -p "Press any key to exit..."
......
windows/scripts/slapos-include.sh
View file @ 3287c5c5
......@@ -10,7 +10,7 @@ fi
csih_get_system_and_admins_ids
if [[ ! " $(id -G) " == *\ $csih_ADMINSUID\ * ]] ; then
echo
echo "You haven't right to run this script. "
echo "You don't have the rights to run this script. "
echo "Please login as Administrator to run it, or right-click this script"
echo "then click Run as administrator."
echo
......@@ -124,7 +124,7 @@ function check_node_configure()
# ======================================================================
function check_client_configure()
{
csih_inform "Checking slapos client confiure ..."
csih_inform "Checking slapos client configure ..."
[[ -f ${client_configure_file} ]] ||
csih_error "Missing client configure file: ${client_configure_file}"
csih_inform "Check slapos client configure Over."
......@@ -136,7 +136,7 @@ function check_client_configure()
# ======================================================================
function check_cron_configure()
{
csih_inform "Checking slapos cron confiure ..."
csih_inform "Checking slapos cron configure ..."
csih_inform "Check slapos cron configure Over."
} # === check_cron_configure() === #
......@@ -146,7 +146,7 @@ function check_cron_configure()
# ======================================================================
function check_re6stnet_configure()
{
csih_inform "Checking slapos re6stnet confiure ..."
csih_inform "Checking slapos re6stnet configure ..."
which re6stnet > /dev/null 2>&1 ||
csih_error "No re6stnet installed, please run Configure SlapOS first."
csih_inform "Check slapos re6stnet configure Over."
......@@ -158,7 +158,7 @@ function check_re6stnet_configure()
# ======================================================================
function check_re6stnet_needed()
{
# This doesn't work in the cygwin now, need hack ip script
# This doesn't work in cygwin now, need hack ip script
# re6st-conf --registry http://re6stnet.nexedi.com/ --is-needed
if netsh interface ipv6 show route | grep -q " ::/0 " ; then
return 1
......@@ -298,15 +298,15 @@ slapos_check_and_create_privileged_user()
if [ -z "${_password}" ]
then
csih_error_multi "Exiting configuration. No user ${username} has been created," \
"and no services have been installed."
"and no service has been installed."
fi
fi
tmpfile1=$(csih_mktemp) || csih_error "Could not create temp file"
csih_call_winsys32 net user "${username}" "${_password}" /add /fullname:"SlapOS Administraoter" \
csih_call_winsys32 net user "${username}" "${_password}" /add /fullname:"SlapOS Administrator" \
"/homedir:${dos_var_empty}" /yes > "${tmpfile1}" 2>&1 && username_in_sam=yes
if [ "${username_in_sam}" != "yes" ]
then
csih_warning "Creating the user '${username}' failed! Reason:"
csih_warning "Creation of user '${username}' failed! Reason:"
/usr/bin/cat "${tmpfile1}"
echo
fi
......@@ -469,7 +469,7 @@ function openwin() {
EOF
fi
else
csih_error_multi "Request return true, but I can't find connection information," \
csih_error_multi "Request returned true, but I can't find connection information," \
"something is wrong with slapos webrunner software."
fi
return ${_ret}
......
windows/scripts/slapos-node.sh
View file @ 3287c5c5
......@@ -50,7 +50,7 @@ fi
# -----------------------------------------------------------
# Format slapos node
# -----------------------------------------------------------
csih_inform "Formating SlapOS Node ..."
csih_inform "Formatting SlapOS Node ..."
/opt/slapos/bin/slapos node format -cv --now ||
csih_error "Run slapos node format failed. "
......
windows/scripts/useradd
View file @ 3287c5c5
......@@ -49,8 +49,8 @@ fi
csih_get_system_and_admins_ids
if [[ ! " $(id -G) " == *\ $csih_ADMINSUID\ * ]] ; then
echo
echo "Note that creating a new user requires that the current account have"
echo "Administrator privileges. You haven't right to run this script. "
echo "Note that creating a new user requires that the current account has"
echo "Administrator privileges. You don't have the rights to run this script. "
echo "Please login as Administrator, or right-click this script"
echo "then click Run as administrator."
echo
......@@ -96,7 +96,7 @@ function create_unprivileged_user()
"/homedir:${dos_var_empty}" /active:no > /dev/null 2>&1 && unpriv_user_in_sam=yes
if [ "${unpriv_user_in_sam}" != "yes" ]
then
csih_warning "Creating the user '${unpriv_user}' failed!"
csih_warning "Creation of user '${unpriv_user}' failed!"
fi
fi
if [ "${unpriv_user_in_sam}" = "yes" ]
......@@ -177,7 +177,7 @@ while getopts "Dd:g:G:p:s:r" opt ; do
r)
;;
*)
echo Error when add user in the Cygwin
echo Error while adding user in Cygwin
exit 1
;;
esac
......@@ -201,5 +201,5 @@ for grpname in ${USER_INIT_GROUP} ${USER_OTHER_GROUP} ; do
done
# net user "${USER_NAME}" /delete ||
# (echo "Faild to delete user ${USER_NAME}" ; exit 1)
# (echo "Failed to delete user ${USER_NAME}" ; exit 1)
# sed -i -e "/^${USER_NAME}/d" /etc/passwd
windows/scripts/usermod
View file @ 3287c5c5
......@@ -59,7 +59,7 @@ while getopts "Dd:g:G:p:s:r" opt ; do
r)
;;
*)
echo Error when add user in the Cygwin
echo Error while adding user in Cygwin
exit 1
;;
esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7