From 35931568028715ceb35f5a2a1e42b28bc95d0cc5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Jan 2020 21:28:36 +0100 Subject: Merging upstream version 20200121. Signed-off-by: Daniel Baumann --- lib/container/auto | 2 +- lib/container/console | 2 +- lib/container/create | 2 +- lib/container/enter | 2 +- lib/container/key | 2 +- lib/container/limit | 2 +- lib/container/list | 2 +- lib/container/log | 2 +- lib/container/move | 2 +- lib/container/remove | 2 +- lib/container/restart | 2 +- lib/container/start | 10 +++++++--- lib/container/stop | 2 +- lib/container/top | 2 +- lib/container/version | 2 +- 15 files changed, 21 insertions(+), 17 deletions(-) (limited to 'lib') diff --git a/lib/container/auto b/lib/container/auto index 83c9a57..16c2933 100755 --- a/lib/container/auto +++ b/lib/container/auto @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/console b/lib/container/console index 0b49058..0628a9d 100755 --- a/lib/container/console +++ b/lib/container/console @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/create b/lib/container/create index 1b9defe..46fc7ee 100755 --- a/lib/container/create +++ b/lib/container/create @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/enter b/lib/container/enter index 10a122f..4c7f890 100755 --- a/lib/container/enter +++ b/lib/container/enter @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/key b/lib/container/key index 1b59555..f4e337c 100755 --- a/lib/container/key +++ b/lib/container/key @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/limit b/lib/container/limit index b1ec170..42f36a2 100755 --- a/lib/container/limit +++ b/lib/container/limit @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/list b/lib/container/list index 5427c90..24457de 100755 --- a/lib/container/list +++ b/lib/container/list @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/log b/lib/container/log index b220b5f..2740213 100755 --- a/lib/container/log +++ b/lib/container/log @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/move b/lib/container/move index 278f972..cdabbe4 100755 --- a/lib/container/move +++ b/lib/container/move @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/remove b/lib/container/remove index 13a9bd8..404b80d 100755 --- a/lib/container/remove +++ b/lib/container/remove @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/restart b/lib/container/restart index 5b78dda..f78cfff 100755 --- a/lib/container/restart +++ b/lib/container/restart @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/start b/lib/container/start index 13fc6ef..f89944d 100755 --- a/lib/container/start +++ b/lib/container/start @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # @@ -34,8 +34,8 @@ Parameters () { OPTIONS_ALL="" - GETOPT_LONGOPTIONS="name:,force,nspawn,start," - GETOPT_OPTIONS="n:f," + GETOPT_LONGOPTIONS="name:,force,nspawn,start,verbose," + GETOPT_OPTIONS="n:,f,v," PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})" @@ -75,6 +75,10 @@ Parameters () shift 1 ;; + -v|--verbose) + VERBOSE="true" + ;; + --) shift 1 break diff --git a/lib/container/stop b/lib/container/stop index 350d9e6..a6bb761 100755 --- a/lib/container/stop +++ b/lib/container/stop @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/top b/lib/container/top index 4978568..81c7436 100755 --- a/lib/container/top +++ b/lib/container/top @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/version b/lib/container/version index d356c3e..8efc91c 100755 --- a/lib/container/version +++ b/lib/container/version @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # -- cgit v1.2.3