From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=ham autolearn_force=no version=3.4.1 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ya.ru; s=mail; t=1662998990; bh=bJwKY/QgTABPhkJfbzOdiudMgtMie6wzJmswdPF1nNU=; h=In-Reply-To:From:Date:References:To:Subject:Message-ID; b=k7mpPZaW/4OY6mqq2FyOOU//x9JyUkpYHAoHg/95KyV5XCciNiTKVyvhJjD7mDvdm kr7WYYHf8UoSwmrBRJZcQhAd2GwQwPaJF8MbQIn0gjt5rfzPyXWMqTWLpe0F/t5wiB qRXL3Ko4JFr2HCCJ7t/vhQ+sT6Bx0z9KLNcpE+L8= Authentication-Results: sas8-9a72d639b2ad.qloud-c.yandex.net; dkim=pass header.i=@ya.ru Message-ID: <2901853c-305b-bb46-7080-80a6890b650b@ya.ru> Date: Mon, 12 Sep 2022 23:09:50 +0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.1 Content-Language: ru To: devel-distro@lists.altlinux.org References: <20220911173359.32561-1-mike@altlinux.org> <20220911173359.32561-2-mike@altlinux.org> From: =?UTF-8?B?0JDQvdGC0L7QvSDQnNC40LTRjtC60L7Qsg==?= In-Reply-To: <20220911173359.32561-2-mike@altlinux.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [devel-distro] [PATCH 1/2] live: add use/live/runapp X-BeenThere: devel-distro@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Distributions development List-Id: Distributions development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2022 16:09:56 -0000 Archived-At: List-Archive: 12.09.2022 00:33, Michael Shigorin пишет: > Add the possibility to directly configure the desktop app > for livecd kiosk mode to start. > > This should have been done as soon as livecd-runapp > hit the streets -- livecd-{0ad,fgfs} definitely must go > as adding a line into config is trivially done near > the only place that requires them (conf.d/live.mk). > > TODO: might be more generally useful for vm/* too, > take this out into a separate feature then. > --- > features.in/live/README | 5 +++++ > features.in/live/config.mk | 5 +++++ > features.in/live/live/image-scripts.d/50-runapp | 16 ++++++++++++++++ > 3 files changed, 26 insertions(+) > create mode 100755 features.in/live/live/image-scripts.d/50-runapp > > diff --git a/features.in/live/README b/features.in/live/README > index 72975f5c9..58302a182 100644 > --- a/features.in/live/README > +++ b/features.in/live/README > @@ -19,3 +19,8 @@ > ** перечисляет префиксы каталогов драйвров ядра для удаления > ** значение: пусто (по умолчанию) или список через пробел > ** см. config.mk > + > +* LIVE_RUNAPP_BINARY > +** указывает имя программы для запуска в режиме киоска > +** значение: пусто (по умолчанию) или путь (из $PATH или полный) > +** см. тж. пакеты livecd-0ad, livecd-fgfs и сам livecd-runapp > diff --git a/features.in/live/config.mk b/features.in/live/config.mk > index e6d762285..59e65b9eb 100644 > --- a/features.in/live/config.mk > +++ b/features.in/live/config.mk > @@ -99,6 +99,11 @@ else > use/live/suspend: use/live; @: > endif > > +# for kiosks > +use/live/runapp: use/live; > + @$(call add,LIVE_PACKAGES,livecd-runapp) > + @$(call xport,LIVE_RUNAPP_BINARY) > + > # deny network/local drive access for security reasons > use/live/privacy: use/services use/memclean use/deflogin \ > use/stage2/ata use/stage2/drm use/stage2/hid \ > diff --git a/features.in/live/live/image-scripts.d/50-runapp b/features.in/live/live/image-scripts.d/50-runapp > new file mode 100755 > index 000000000..3da410108 > --- /dev/null > +++ b/features.in/live/live/image-scripts.d/50-runapp > @@ -0,0 +1,16 @@ > +#!/bin/sh -efu > +# see also live-0ad > + Не надо выполнять, если нет пакета livecd-runapp или не задана переменная LIVE_RUNAPP_BINARY: +[ rpm -q livecd-runapp ] || exit 0 +[ -n "$GLOBAL_LIVE_RUNAPP_BINARY" ] || exit 0 так как иначе в live будет ничейный файл /etc/sysconfig/livecd-runapp либо файл с бессмысленным содержимым: # mkimage-profiles live 50-runapp hook BINARY= что тоже нехорошо. > +CONFIG=/etc/sysconfig/livecd-runapp > + > +if [ -s "$CONFIG" ]; then > + echo "$CONFIG exists, not overriding (from $(rpm -qf "$CONFIG"))" > + exit 0 > +fi > + > +mkdir -p "$(dirname "$CONFIG")" > +cat >> "$CONFIG" << _EOF_ > +# mkimage-profiles live 50-runapp hook > +BINARY=$GLOBAL_LIVE_RUNAPP_BINARY > +_EOF_ > +: -- С уважением, Антон Мидюков