Commit 75b40836 authored by Nicolas Delvaux's avatar Nicolas Delvaux Committed by Sébastien Luttringer
Browse files

Typos: "mout" was used instead of "mount" in several parts of the project. 



Signed-off-by: default avatarSébastien Luttringer <sebastien.luttringer@smartjog.com>
parent 5bbfb37f

bin/is

+3 −3
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ def arg_parser_init(): 
    # chroot command parser

    p = subparser.add_parser("chroot", help=c_chroot.__doc__.lower())

    p.add_argument("-m", "--no-mount", action="store_true",

                   help="disable mouting of /{proc,dev,sys} inside chroot")

                   help="disable mounting of /{proc,dev,sys} inside chroot")

    p.add_argument("-s", "--shell", default=u"/bin/bash",

                   help="shell to call inside chroot")

    p.add_argument("path")
@@ -639,7 +639,7 @@ def arg_parser_init(): 
    p = subparser.add_parser("prepare_chroot",

                              help=c_prepare_chroot.__doc__.lower())

    p.add_argument("-m", "--no-mount", action="store_true",

                   help="disable mouting of /{proc,dev,sys}")

                   help="disable mounting of /{proc,dev,sys}")

    p.add_argument("path")

    p.set_defaults(func=c_prepare_chroot)

    # repo command parser
@@ -672,7 +672,7 @@ def arg_parser_init(): 
    p = subparser.add_parser("unprepare_chroot",

                              help=c_unprepare_chroot.__doc__.lower())

    p.add_argument("-m", "--no-umount", action="store_true",

                   help="disable unmouting of /{proc,dev,sys}")

                   help="disable unmounting of /{proc,dev,sys}")

    p.add_argument("path")

    p.set_defaults(func=c_unprepare_chroot)

    # version command parser

completion/zsh/_installsystems

+3 −3
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ _is() { 
                        ;;

                    (chroot)

                        args+=(

                        '(-m --no-mount)'{-m,--no-mount}'[disable mouting of /{proc,dev,sys} inside chroot]'

                        '(-m --no-mount)'{-m,--no-mount}'[disable mounting of /{proc,dev,sys} inside chroot]'

                        '(-s --shell)'{-s,--shell}'[shell to call inside chroot]:shell'

                        '1:path:_files -/'

                        )
@@ -264,7 +264,7 @@ _is() { 
                        ;;

                    (prepare_chroot)

                        args+=(

                        '(-m --no-mount)'{-m,--no-mount}'[disable mouting of /{proc,dev,sys}]'

                        '(-m --no-mount)'{-m,--no-mount}'[disable mounting of /{proc,dev,sys}]'

                        '1:path:_files -/'

                        )

                        ;;
@@ -288,7 +288,7 @@ _is() { 
                        ;;

                    (unprepare_chroot)

                        args+=(

                        '(-m --no-umount)'{-m,--no-umount}'[disable unmouting of /{proc,dev,sys}]'

                        '(-m --no-umount)'{-m,--no-umount}'[disable unmounting of /{proc,dev,sys}]'

                        '1:path:_files -/'

                        )

                        ;;

installsystems/tools.py

+3 −3
Original line number Diff line number Diff line
@@ -421,13 +421,13 @@ def guess_distro(path): 


def prepare_chroot(path, mount=True):

    '''

    Prepare a chroot environment by mouting /{proc,sys,dev,dev/pts}

    Prepare a chroot environment by mounting /{proc,sys,dev,dev/pts}

    and try to guess dest os to avoid daemon launching

    '''

    # try to mount /proc /sys /dev /dev/pts /dev/shm

    if mount:

        mps = ("proc", "sys", "dev", "dev/pts", "dev/shm")

        arrow("Mouting filesystems")

        arrow("Mounting filesystems")

        for mp in mps:

            origin =  u"/%s" % mp

            target = os.path.join(path, mp)
@@ -551,7 +551,7 @@ def unprepare_chroot(path, mount=True): 
    # unmounting

    if mount:

        mps = ("proc", "sys", "dev", "dev/pts", "dev/shm")

        arrow("Unmouting filesystems")

        arrow("Unmounting filesystems")

        for mp in reversed(mps):

            target = join(path, mp)

            if os.path.ismount(target):