Merge "Revert "Add commonly used C++ macros to libbase.""
diff --git a/init/builtins.cpp b/init/builtins.cpp
index 5d1ad29..543f89b 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -104,12 +104,6 @@
}
}
-int do_chdir(int nargs, char **args)
-{
- chdir(args[1]);
- return 0;
-}
-
int do_chroot(int nargs, char **args)
{
chroot(args[1]);
diff --git a/init/init_parser.cpp b/init/init_parser.cpp
index 7f8e302..5ef54c8 100644
--- a/init/init_parser.cpp
+++ b/init/init_parser.cpp
@@ -121,7 +121,6 @@
case 'c':
if (!strcmp(s, "opy")) return K_copy;
if (!strcmp(s, "apability")) return K_capability;
- if (!strcmp(s, "hdir")) return K_chdir;
if (!strcmp(s, "hroot")) return K_chroot;
if (!strcmp(s, "lass")) return K_class;
if (!strcmp(s, "lass_start")) return K_class_start;
diff --git a/init/keywords.h b/init/keywords.h
index 0b37e27..4af8c9e 100644
--- a/init/keywords.h
+++ b/init/keywords.h
@@ -1,7 +1,6 @@
#ifndef KEYWORD
int do_bootchart_init(int nargs, char **args);
int do_chroot(int nargs, char **args);
-int do_chdir(int nargs, char **args);
int do_class_start(int nargs, char **args);
int do_class_stop(int nargs, char **args);
int do_class_reset(int nargs, char **args);
@@ -46,7 +45,6 @@
K_UNKNOWN,
#endif
KEYWORD(capability, OPTION, 0, 0)
- KEYWORD(chdir, COMMAND, 1, do_chdir)
KEYWORD(chroot, COMMAND, 1, do_chroot)
KEYWORD(class, OPTION, 0, 0)
KEYWORD(class_start, COMMAND, 1, do_class_start)
diff --git a/init/readme.txt b/init/readme.txt
index d2933b9..0a85a95 100644
--- a/init/readme.txt
+++ b/init/readme.txt
@@ -164,9 +164,6 @@
hostname <name>
Set the host name.
-chdir <directory>
- Change working directory.
-
chmod <octal-mode> <path>
Change file access permissions.
@@ -205,13 +202,16 @@
mkdir <path> [mode] [owner] [group]
Create a directory at <path>, optionally with the given mode, owner, and
group. If not provided, the directory is created with permissions 755 and
- owned by the root user and root group.
+ owned by the root user and root group. If provided, the mode, owner and group
+ will be updated if the directory exists already.
-mount <type> <device> <dir> [ <mountoption> ]*
+mount <type> <device> <dir> [ <flag> ]* [<options>]
Attempt to mount the named device at the directory <dir>
<device> may be of the form mtd@name to specify a mtd block
device by name.
- <mountoption>s include "ro", "rw", "remount", "noatime", ...
+ <flag>s include "ro", "rw", "remount", "noatime", ...
+ <options> include "barrier=1", "noauto_da_alloc", "discard", ... as
+ a comma separated string, eg: barrier=1,noauto_da_alloc
restorecon <path> [ <path> ]*
Restore the file named by <path> to the security context specified