Commit ec64264d by Veres Lajos Committed by Stéphane Graber
parent 8479c136
...@@ -1940,7 +1940,7 @@ PREDEFINED = ...@@ -1940,7 +1940,7 @@ PREDEFINED =
EXPAND_AS_DEFINED = EXPAND_AS_DEFINED =
# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
# remove all refrences to function-like macros that are alone on a line, have an # remove all references to function-like macros that are alone on a line, have an
# all uppercase name, and do not end with a semicolon. Such function macros are # all uppercase name, and do not end with a semicolon. Such function macros are
# typically used for boiler-plate code, and will confuse the parser if not # typically used for boiler-plate code, and will confuse the parser if not
# removed. # removed.
......
...@@ -754,7 +754,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> ...@@ -754,7 +754,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
the maximum number of pseudo ttys allowed for a pts the maximum number of pseudo ttys allowed for a pts
instance (this limitation is not implemented yet). instance (this limitation is not implemented yet).
--> -->
もし設定された場合、コンテナは新しい psuedo tty インスタンスを持ち、それを自身のプライベートとします。 もし設定された場合、コンテナは新しい pseudo tty インスタンスを持ち、それを自身のプライベートとします。
この値は pts インスタンスに許可される pseudo tty の最大数を指定します (この制限はまだ実装されていません)。 この値は pts インスタンスに許可される pseudo tty の最大数を指定します (この制限はまだ実装されていません)。
</para> </para>
</listitem> </listitem>
......
...@@ -297,7 +297,7 @@ fi ...@@ -297,7 +297,7 @@ fi
%changelog %changelog
* Tue Oct 22 2013 Dwight Engen <dwight.engen@oracle.com> - 1.0.0-0.1.alpha2 * Tue Oct 22 2013 Dwight Engen <dwight.engen@oracle.com> - 1.0.0-0.1.alpha2
- fix some rpmlint warnings/errors - fix some rpmlint warnings/errors
- split lua bits into seperate package - split lua bits into separate package
* Mon Sep 10 2012 Dwight Engen <dwight.engen@oracle.com> - 0.8.0 * Mon Sep 10 2012 Dwight Engen <dwight.engen@oracle.com> - 0.8.0
- fix lxc-init moved to libexec - fix lxc-init moved to libexec
......
...@@ -729,7 +729,7 @@ int lxc_attach(const char* name, const char* lxcpath, lxc_attach_exec_t exec_fun ...@@ -729,7 +729,7 @@ int lxc_attach(const char* name, const char* lxcpath, lxc_attach_exec_t exec_fun
if (pid) { if (pid) {
pid_t to_cleanup_pid = pid; pid_t to_cleanup_pid = pid;
/* inital thread, we close the socket that is for the /* initial thread, we close the socket that is for the
* subprocesses * subprocesses
*/ */
close(ipc_sockets[1]); close(ipc_sockets[1]);
......
...@@ -86,7 +86,7 @@ typedef struct lxc_attach_options_t { ...@@ -86,7 +86,7 @@ typedef struct lxc_attach_options_t {
*/ */
long personality; long personality;
/*! Inital current directory, use \c NULL to use cwd. /*! Initial current directory, use \c NULL to use cwd.
* If the current directory does not exist in the container, the * If the current directory does not exist in the container, the
* root directory will be used instead because of kernel defaults. * root directory will be used instead because of kernel defaults.
*/ */
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/* /*
* this is all just a first shot for experiment. If we go this route, much * this is all just a first shot for experiment. If we go this route, much
* shoudl change. bdev should be a directory with per-bdev file. Things which * should change. bdev should be a directory with per-bdev file. Things which
* I'm doing by calling out to userspace should sometimes be done through * I'm doing by calling out to userspace should sometimes be done through
* libraries like liblvm2 * libraries like liblvm2
*/ */
...@@ -2966,7 +2966,7 @@ static bool requires_nbd(const char *path) ...@@ -2966,7 +2966,7 @@ static bool requires_nbd(const char *path)
* attach_block_device returns true if all went well, * attach_block_device returns true if all went well,
* meaning either a block device was attached or was not * meaning either a block device was attached or was not
* needed. It returns false if something went wrong and * needed. It returns false if something went wrong and
* container startup shoudl be stopped. * container startup should be stopped.
*/ */
bool attach_block_device(struct lxc_conf *conf) bool attach_block_device(struct lxc_conf *conf)
{ {
...@@ -3486,7 +3486,7 @@ static struct bdev * do_bdev_create(const char *dest, const char *type, ...@@ -3486,7 +3486,7 @@ static struct bdev * do_bdev_create(const char *dest, const char *type,
/* /*
* bdev_create: * bdev_create:
* Create a backing store for a container. * Create a backing store for a container.
* If successfull, return a struct bdev *, with the bdev mounted and ready * If successful, return a struct bdev *, with the bdev mounted and ready
* for use. Before completing, the caller will need to call the * for use. Before completing, the caller will need to call the
* umount operation and bdev_put(). * umount operation and bdev_put().
* @dest: the mountpoint (i.e. /var/lib/lxc/$name/rootfs) * @dest: the mountpoint (i.e. /var/lib/lxc/$name/rootfs)
......
...@@ -1002,7 +1002,7 @@ static struct cgroup_process_info *lxc_cgroupfs_create(const char *name, const c ...@@ -1002,7 +1002,7 @@ static struct cgroup_process_info *lxc_cgroupfs_create(const char *name, const c
continue; continue;
cleanup_from_error: cleanup_from_error:
/* called if an error occured in the loop, so we /* called if an error occurred in the loop, so we
* do some additional cleanup here * do some additional cleanup here
*/ */
saved_errno = errno; saved_errno = errno;
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
* Each command is transactional, the clients send a request to * Each command is transactional, the clients send a request to
* the server and the server answers the request with a message * the server and the server answers the request with a message
* giving the request's status (zero or a negative errno value). * giving the request's status (zero or a negative errno value).
* Both the request and response may contain addtional data. * Both the request and response may contain additional data.
* *
* Each command is wrapped in a ancillary message in order to pass * Each command is wrapped in a ancillary message in order to pass
* a credential making possible to the server to check if the client * a credential making possible to the server to check if the client
......
...@@ -1297,7 +1297,7 @@ static int mount_autodev(const char *name, char *root, const char *lxcpath) ...@@ -1297,7 +1297,7 @@ static int mount_autodev(const char *name, char *root, const char *lxcpath)
* Get rid of old links and directoriess * Get rid of old links and directoriess
* This could be either a symlink and we remove it, * This could be either a symlink and we remove it,
* or an empty directory and we remove it, * or an empty directory and we remove it,
* or non-existant and we don't care, * or non-existent and we don't care,
* or a non-empty directory, and we will then emit an error * or a non-empty directory, and we will then emit an error
* but we will not fail out the process. * but we will not fail out the process.
*/ */
......
...@@ -140,7 +140,7 @@ struct lxc_netdev { ...@@ -140,7 +140,7 @@ struct lxc_netdev {
/* /*
* Defines a generic struct to configure the control group. * Defines a generic struct to configure the control group.
* It is up to the programmer to specify the right subsystem. * It is up to the programmer to specify the right subsystem.
* @subsystem : the targetted subsystem * @subsystem : the targeted subsystem
* @value : the value to set * @value : the value to set
*/ */
struct lxc_cgroup { struct lxc_cgroup {
......
...@@ -1514,7 +1514,7 @@ static int config_mount(const char *key, const char *value, ...@@ -1514,7 +1514,7 @@ static int config_mount(const char *key, const char *value,
return config_mount_auto(key, value, lxc_conf); return config_mount_auto(key, value, lxc_conf);
} }
/* At this point we definately have key = lxc.mount.entry */ /* At this point we definitely have key = lxc.mount.entry */
if (!value || strlen(value) == 0) if (!value || strlen(value) == 0)
return lxc_clear_mount_entries(lxc_conf); return lxc_clear_mount_entries(lxc_conf);
......
...@@ -200,7 +200,7 @@ static int log_open(const char *name) ...@@ -200,7 +200,7 @@ static int log_open(const char *name)
* Build the path to the log file * Build the path to the log file
* @name : the name of the container * @name : the name of the container
* @lxcpath : the lxcpath to use as a basename or NULL to use LOGPATH * @lxcpath : the lxcpath to use as a basename or NULL to use LOGPATH
* Returns malloced path on sucess, or NULL on failure * Returns malloced path on success, or NULL on failure
*/ */
static char *build_log_path(const char *name, const char *lxcpath) static char *build_log_path(const char *name, const char *lxcpath)
{ {
......
...@@ -245,7 +245,7 @@ struct btrfs_root_item { ...@@ -245,7 +245,7 @@ struct btrfs_root_item {
/* /*
* This generation number is used to test if the new fields are valid * This generation number is used to test if the new fields are valid
* and up to date while reading the root item. Everytime the root item * and up to date while reading the root item. Every time the root item
* is written out, the "generation" field is copied into this field. If * is written out, the "generation" field is copied into this field. If
* anyone ever mounted the fs with an older kernel, we will have * anyone ever mounted the fs with an older kernel, we will have
* mismatching generation values here and thus must invalidate the * mismatching generation values here and thus must invalidate the
......
...@@ -42,7 +42,7 @@ if [ ! -f $CONFIG ]; then ...@@ -42,7 +42,7 @@ if [ ! -f $CONFIG ]; then
if [ ! -f "$CONFIG" ]; then if [ ! -f "$CONFIG" ]; then
MODULEFILE=$(modinfo -k $KVER -n $MODNAME 2> /dev/null) MODULEFILE=$(modinfo -k $KVER -n $MODNAME 2> /dev/null)
# don't want to modprobe, so give user a hint # don't want to modprobe, so give user a hint
# altho scripts/extract-ikconfig could be used to extract contents without loading kernel module # although scripts/extract-ikconfig could be used to extract contents without loading kernel module
# http://svn.pld-linux.org/trac/svn/browser/geninitrd/trunk/geninitrd?rev=12696#L327 # http://svn.pld-linux.org/trac/svn/browser/geninitrd/trunk/geninitrd?rev=12696#L327
fi fi
GREP=grep GREP=grep
......
...@@ -47,7 +47,7 @@ struct lxc_arguments; ...@@ -47,7 +47,7 @@ struct lxc_arguments;
* @name : the name of the container * @name : the name of the container
* @argv : an array of char * corresponding to the commande line * @argv : an array of char * corresponding to the commande line
* @conf : configuration * @conf : configuration
* Returns 0 on sucess, < 0 otherwise * Returns 0 on success, < 0 otherwise
*/ */
extern int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf, extern int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf,
const char *lxcpath); const char *lxcpath);
...@@ -58,7 +58,7 @@ extern int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf ...@@ -58,7 +58,7 @@ extern int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf
* @argv : an array of char * corresponding to the commande line * @argv : an array of char * corresponding to the commande line
* @quiet : if != 0 then lxc-init won't produce any output * @quiet : if != 0 then lxc-init won't produce any output
* @conf : configuration * @conf : configuration
* Returns 0 on sucess, < 0 otherwise * Returns 0 on success, < 0 otherwise
*/ */
extern int lxc_execute(const char *name, char *const argv[], int quiet, extern int lxc_execute(const char *name, char *const argv[], int quiet,
struct lxc_conf *conf, const char *lxcpath); struct lxc_conf *conf, const char *lxcpath);
...@@ -118,7 +118,7 @@ extern int lxc_freeze(const char *name, const char *lxcpath); ...@@ -118,7 +118,7 @@ extern int lxc_freeze(const char *name, const char *lxcpath);
/* /*
* Unfreeze all previously frozen tasks. * Unfreeze all previously frozen tasks.
* @name : the name of the container * @name : the name of the container
* Return 0 on sucess, < 0 otherwise * Return 0 on success, < 0 otherwise
*/ */
extern int lxc_unfreeze(const char *name, const char *lxcpath); extern int lxc_unfreeze(const char *name, const char *lxcpath);
......
...@@ -580,7 +580,7 @@ struct lxc_container { ...@@ -580,7 +580,7 @@ struct lxc_container {
* \param c Container. * \param c Container.
* \param[in,out] ttynum Terminal number to attempt to allocate, * \param[in,out] ttynum Terminal number to attempt to allocate,
* or \c -1 to allocate the first available tty. * or \c -1 to allocate the first available tty.
* \param[out] masterfd File descriptor refering to the master side of the pty. * \param[out] masterfd File descriptor referring to the master side of the pty.
* *
* \return tty file descriptor number on success, or \c -1 on * \return tty file descriptor number on success, or \c -1 on
* failure. * failure.
......
...@@ -343,7 +343,7 @@ void process_unlock(void) ...@@ -343,7 +343,7 @@ void process_unlock(void)
} }
/* One thread can do fork() while another one is holding a mutex. /* One thread can do fork() while another one is holding a mutex.
* There is only one thread in child just after the fork(), so noone will ever release that mutex. * There is only one thread in child just after the fork(), so no one will ever release that mutex.
* We setup a "child" fork handler to unlock the mutex just after the fork(). * We setup a "child" fork handler to unlock the mutex just after the fork().
* For several mutex types, unlocking an unlocked mutex can lead to undefined behavior. * For several mutex types, unlocking an unlocked mutex can lead to undefined behavior.
* One way to deal with it is to setup "prepare" fork handler * One way to deal with it is to setup "prepare" fork handler
......
...@@ -718,7 +718,7 @@ static int do_start(void *data) ...@@ -718,7 +718,7 @@ static int do_start(void *data)
} }
/* The clearenv() and putenv() calls have been moved here /* The clearenv() and putenv() calls have been moved here
* to allow us to use enviroment variables passed to the various * to allow us to use environment variables passed to the various
* hooks, such as the start hook above. Not all of the * hooks, such as the start hook above. Not all of the
* variables like CONFIG_PATH or ROOTFS are valid in this * variables like CONFIG_PATH or ROOTFS are valid in this
* context but others are. */ * context but others are. */
......
...@@ -38,7 +38,7 @@ default_path=@LXCPATH@ ...@@ -38,7 +38,7 @@ default_path=@LXCPATH@
# #
# If the root password contains a ding ($) then try to expand it. # If the root password contains a ding ($) then try to expand it.
# That will pick up things like ${name} and ${RANDOM}. # That will pick up things like ${name} and ${RANDOM}.
# If the root password contians more than 3 consecutive X's, pass it as # If the root password contains more than 3 consecutive X's, pass it as
# a template to mktemp and take the result. # a template to mktemp and take the result.
# #
# If root_display_password = yes, display the temporary root password at exit. # If root_display_password = yes, display the temporary root password at exit.
...@@ -771,7 +771,7 @@ else ...@@ -771,7 +771,7 @@ else
root_password=$(eval echo "${root_password}") root_password=$(eval echo "${root_password}")
fi fi
# If it has more than 3 consequtive X's in it, feed it # If it has more than 3 consecutive X's in it, feed it
# through mktemp as a template. # through mktemp as a template.
if [ $(expr "${root_password}" : '.*XXXX') != 0 ] if [ $(expr "${root_password}" : '.*XXXX') != 0 ]
then then
......
...@@ -190,7 +190,7 @@ configure_debian_systemd() ...@@ -190,7 +190,7 @@ configure_debian_systemd()
init="$(chroot ${rootfs} dpkg-query --search /sbin/init | cut -d : -f 1)" init="$(chroot ${rootfs} dpkg-query --search /sbin/init | cut -d : -f 1)"
if [ "$init" = "systemd-sysv" ]; then if [ "$init" = "systemd-sysv" ]; then
# only appropiate when systemd is PID 1 # only appropriate when systemd is PID 1
echo 'lxc.autodev = 1' >> "$path/config" echo 'lxc.autodev = 1' >> "$path/config"
echo 'lxc.kmsg = 0' >> "$path/config" echo 'lxc.kmsg = 0' >> "$path/config"
fi fi
......
...@@ -38,7 +38,7 @@ default_path=@LXCPATH@ ...@@ -38,7 +38,7 @@ default_path=@LXCPATH@
# #
# If the root password contains a ding ($) then try to expand it. # If the root password contains a ding ($) then try to expand it.
# That will pick up things like ${name} and ${RANDOM}. # That will pick up things like ${name} and ${RANDOM}.
# If the root password contians more than 3 consecutive X's, pass it as # If the root password contains more than 3 consecutive X's, pass it as
# a template to mktemp and take the result. # a template to mktemp and take the result.
# #
# If root_display_password = yes, display the temporary root password at exit. # If root_display_password = yes, display the temporary root password at exit.
...@@ -435,7 +435,7 @@ configure_fedora_systemd() ...@@ -435,7 +435,7 @@ configure_fedora_systemd()
# (mounting the iso) to the stage0 setup. # (mounting the iso) to the stage0 setup.
# This system is designed to be as autonomous as possible so all whitelists # This system is designed to be as autonomous as possible so all whitelists
# and controlls are self-contained. # and controls are self-contained.
# Initial testing - Whitelist nobody. Build for everybody... # Initial testing - Whitelist nobody. Build for everybody...
# Initial deployment - Whitelist Fedora. # Initial deployment - Whitelist Fedora.
...@@ -505,7 +505,7 @@ an Installation Bootstrap Please install rsync and then rerun this process. ...@@ -505,7 +505,7 @@ an Installation Bootstrap Please install rsync and then rerun this process.
# We know we don't have a cache directory of this version or we # We know we don't have a cache directory of this version or we
# would have never reached this code to begin with. But we may # would have never reached this code to begin with. But we may
# have another Fedora cache directory from which we could run... # have another Fedora cache directory from which we could run...
# We'll give a preference for close matches prefering higher over # We'll give a preference for close matches preferring higher over
# lower - which makes for really ugly code... # lower - which makes for really ugly code...
# Is this a "bashism" that will need cleaning up???? # Is this a "bashism" that will need cleaning up????
...@@ -1246,7 +1246,7 @@ else ...@@ -1246,7 +1246,7 @@ else
root_password=$(eval echo "${root_password}") root_password=$(eval echo "${root_password}")
fi fi
# If it has more than 3 consequtive X's in it, feed it # If it has more than 3 consecutive X's in it, feed it
# through mktemp as a template. # through mktemp as a template.
if [ $(expr "${root_password}" : '.*XXXX') != 0 ] if [ $(expr "${root_password}" : '.*XXXX') != 0 ]
then then
......
...@@ -142,7 +142,7 @@ cache_precheck() ...@@ -142,7 +142,7 @@ cache_precheck()
printf "### cache_precheck(): doing some pre-start checks ...\n" printf "### cache_precheck(): doing some pre-start checks ...\n"
# never hurts to have a fail-safe. # never hurts to have a fail-safe.
[[ -n "${cacheroot//\/}" ]] \ [[ -n "${cacheroot//\/}" ]] \
|| die 8 "\$cacheroot (%s) IS EMPTY OR MADE OF ONLY DIRECTORY SEPERATORS, THIS IS *VERY* BAD!\n" "${cacheroot}" || die 8 "\$cacheroot (%s) IS EMPTY OR MADE OF ONLY DIRECTORY SEPARATORS, THIS IS *VERY* BAD!\n" "${cacheroot}"
} }
#get latest stage3 tarball #get latest stage3 tarball
...@@ -320,13 +320,13 @@ container_precheck() ...@@ -320,13 +320,13 @@ container_precheck()
printf "### container_precheck(): doing some pre-start checks ...\n" printf "### container_precheck(): doing some pre-start checks ...\n"
# never hurts to have a fail-safe. # never hurts to have a fail-safe.
[[ -n "${name//\/}" ]] \ [[ -n "${name//\/}" ]] \
|| die 8 "\$name (%s) IS EMPTY OR MADE OF ONLY DIRECTORY SEPERATORS, THIS IS *VERY* BAD!\n" "${name}" || die 8 "\$name (%s) IS EMPTY OR MADE OF ONLY DIRECTORY SEPARATORS, THIS IS *VERY* BAD!\n" "${name}"
[[ -n "${rootfs//\/}" ]] \ [[ -n "${rootfs//\/}" ]] \
|| die 8 "\$rootfs (%s) IS EMPTY OR MADE OF ONLY DIRECTORY SEPERATORS, THIS IS *VERY* BAD!\n" "${rootfs}" || die 8 "\$rootfs (%s) IS EMPTY OR MADE OF ONLY DIRECTORY SEPARATORS, THIS IS *VERY* BAD!\n" "${rootfs}"
[[ -n "${cachefs//\/}" ]] \ [[ -n "${cachefs//\/}" ]] \
|| die 8 "\$cachefs (%s) IS EMPTY OR MADE OF ONLY DIRECTORY SEPERATORS, THIS IS *VERY* BAD!\n" "${cachefs}" || die 8 "\$cachefs (%s) IS EMPTY OR MADE OF ONLY DIRECTORY SEPARATORS, THIS IS *VERY* BAD!\n" "${cachefs}"
# check if the rootfs already exists # check if the rootfs already exists
[[ -d "${rootfs}/etc" ]] && die 18 "Error: \$rootfs (%s) already exists!" "${rootfs}" [[ -d "${rootfs}/etc" ]] && die 18 "Error: \$rootfs (%s) already exists!" "${rootfs}"
...@@ -473,7 +473,7 @@ lxc.mount.entry=${portage_distfiles_dir} ${portage_container/\//}/distfiles none ...@@ -473,7 +473,7 @@ lxc.mount.entry=${portage_distfiles_dir} ${portage_container/\//}/distfiles none
#PKGDIR="\${PKGDIR}/amd64 #PKGDIR="\${PKGDIR}/amd64
#or PKGDIR="\${PKGDIR}/hardened" #or PKGDIR="\${PKGDIR}/hardened"
EOF EOF
printf " => portage stuff done, see /etc/portage/make.conf for additionnal tricks\n" printf " => portage stuff done, see /etc/portage/make.conf for additional tricks\n"
} }
...@@ -564,7 +564,7 @@ container_net() ...@@ -564,7 +564,7 @@ container_net()
#Analyse network configuration in config #Analyse network configuration in config
container_conf_net "$path/config" >> "${rootfs}/etc/conf.d/net" container_conf_net "$path/config" >> "${rootfs}/etc/conf.d/net"
# found how much nic finaly have # found how much nic finally have
nic_count=$(( ${nic_last} + 1 )) nic_count=$(( ${nic_last} + 1 ))
# unless openrc manage a nic, we now have to force openrc to automatic # unless openrc manage a nic, we now have to force openrc to automatic
......
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