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=0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,FUZZY_XPILL autolearn=no autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ya.ru; s=mail; t=1575472423; bh=dP36TbYvrjrjZ571vhwQKl0qYk4eX7dt7HnNVgfjKSY=; h=Subject:From:To:Date:Message-ID; b=EVWQ9ydI151gF/GdiqgCTrCcrwyOPgPfF7jEHicyW8wGpDbu95ZHEYN9Ts7ngdKT4 jI6msOwGbNW2xIGXWAEOkTR8kihi2AqjpOjEfLjeCge+W5iZLOUltiWa6NEhrFXPG+ L5LpOAivCjNvbey9U2ssMagWtwd9YdIajoiI1+G0= Authentication-Results: mxback2q.mail.yandex.net; dkim=pass header.i=@ya.ru To: devel-distro@lists.altlinux.org From: =?UTF-8?B?0JDQvdGC0L7QvSDQnNC40LTRjtC60L7Qsg==?= Message-ID: <45f66149-5705-1bbf-bc3e-c86ec573008a@ya.ru> Date: Wed, 4 Dec 2019 22:13:40 +0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------EF290B6E3886BA29595C5930" Content-Language: ru Subject: [devel-distro] =?utf-8?b?0J/QtdGA0LXRhdC+0LQg0L3QsCDRgdC40LzQu9C4?= =?utf-8?b?0L3QuiAvdmFyL3J1biAtPiAuLi9ydW4g0L/RgNC4INGB0LHQvtGA0LrQtQ==?= 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: Wed, 04 Dec 2019 15:13:46 -0000 Archived-At: List-Archive: This is a multi-part message in MIME format. --------------EF290B6E3886BA29595C5930 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Доброго времени суток В настоящее время в наших лайвах и rootfs всё ещё не осуществлён переход на симлинки: /var/run -> ../run /var/lock -> ../run/lock Это может приводить к проблемам размонтирования /run при выключении, например: https://bugzilla.altlinux.org/37568 Подготовил патч переход при сборке rootfs, live и rescue Результат опробован на сборке беты стартеркитов: http://nightly.altlinux.org/p9/beta/ Я также пробовал добавить скрипт этот на уровень stage2, но это привело к неработоспособности инсталятора (вылетает при переходе на шаг установки загрузчика), а в live перестала сохраняться сессия. -- С уважением, Антон Мидюков --------------EF290B6E3886BA29595C5930 Content-Type: text/x-patch; name="0001-init-create-symlinks-var-run-run-var-lock-run-lock.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-init-create-symlinks-var-run-run-var-lock-run-lock.patc"; filename*1="h" >>From 1a467ace7548aad55b4f4d297cacbf2491b21b9b Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Sat, 30 Nov 2019 22:42:21 +0700 Subject: [PATCH 1/8] init: create symlinks /var/run -> /run, /var/lock -> /run/lock See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=35350 --- .../init/live/image-scripts.d/50-var-run-fix | 9 ++++++++ .../init/rescue/image-scripts.d/50-sysvinit | 16 -------------- .../rescue/image-scripts.d/50-var-run-fix | 9 ++++++++ .../init/rootfs/image-scripts.d/40-sysvinit | 10 --------- .../init/rootfs/image-scripts.d/50-sysvinit | 22 ------------------- .../rootfs/image-scripts.d/50-var-run-fix | 9 ++++++++ 6 files changed, 27 insertions(+), 48 deletions(-) create mode 100755 features.in/init/live/image-scripts.d/50-var-run-fix delete mode 100755 features.in/init/rescue/image-scripts.d/50-sysvinit create mode 100755 features.in/init/rescue/image-scripts.d/50-var-run-fix delete mode 100755 features.in/init/rootfs/image-scripts.d/40-sysvinit delete mode 100755 features.in/init/rootfs/image-scripts.d/50-sysvinit create mode 100755 features.in/init/rootfs/image-scripts.d/50-var-run-fix diff --git a/features.in/init/live/image-scripts.d/50-var-run-fix b/features.in/init/live/image-scripts.d/50-var-run-fix new file mode 100755 index 0000000000..57a07b3152 --- /dev/null +++ b/features.in/init/live/image-scripts.d/50-var-run-fix @@ -0,0 +1,9 @@ +#!/bin/sh + +# this was a bunch of dirty complaints +sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||: + +[ ! -L /var/run ] && rm -r /var/run && ln -s ../run /var/run +[ ! -L /var/lock ] && rm -r /var/lock && ln -s ../run/lock /var/lock + +: diff --git a/features.in/init/rescue/image-scripts.d/50-sysvinit b/features.in/init/rescue/image-scripts.d/50-sysvinit deleted file mode 100755 index 6be4c3bd31..0000000000 --- a/features.in/init/rescue/image-scripts.d/50-sysvinit +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -# the part below relates to sysvinit specifically -rpm -q sysvinit || exit 0 - -# this was a bunch of dirty complaints -sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||: - -# https://bugzilla.altlinux.org/35350 -# this FAILS: no symlinks... -#rm -rf /var/run /var/lock -# ...so just revert what's been broken in failsystem package -mkdir -p /var/run /var/lock/{serial,subsys,uucp} -chmod 0770 /var/lock/subsys -chmod 0770 /var/lock/{serial,uucp} -chgrp uucp /var/lock/{serial,uucp} diff --git a/features.in/init/rescue/image-scripts.d/50-var-run-fix b/features.in/init/rescue/image-scripts.d/50-var-run-fix new file mode 100755 index 0000000000..57a07b3152 --- /dev/null +++ b/features.in/init/rescue/image-scripts.d/50-var-run-fix @@ -0,0 +1,9 @@ +#!/bin/sh + +# this was a bunch of dirty complaints +sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||: + +[ ! -L /var/run ] && rm -r /var/run && ln -s ../run /var/run +[ ! -L /var/lock ] && rm -r /var/lock && ln -s ../run/lock /var/lock + +: diff --git a/features.in/init/rootfs/image-scripts.d/40-sysvinit b/features.in/init/rootfs/image-scripts.d/40-sysvinit deleted file mode 100755 index 40aeb68bad..0000000000 --- a/features.in/init/rootfs/image-scripts.d/40-sysvinit +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# 40: should run before 50-users in deflogin - -# the part below relates to sysvinit specifically -rpm -q sysvinit || exit 0 - -# NM-specific group -case "$GLOBAL_GROUPS" in - *_nmconnect*) groupadd -r _nmconnect ||:;; -esac diff --git a/features.in/init/rootfs/image-scripts.d/50-sysvinit b/features.in/init/rootfs/image-scripts.d/50-sysvinit deleted file mode 100755 index 390d490f47..0000000000 --- a/features.in/init/rootfs/image-scripts.d/50-sysvinit +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# 40: should run before 50-users in deflogin - -# the part below relates to sysvinit specifically -rpm -q sysvinit || exit 0 - -# NM-specific group -case "$GLOBAL_GROUPS" in - *_nmconnect*) groupadd -r _nmconnect ||:;; -esac - -# this was a bunch of dirty complaints -sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||: - -# https://bugzilla.altlinux.org/35350 -# this FAILS: no symlinks... -#rm -rf /var/run /var/lock -# ...so just revert what's been broken in failsystem package -mkdir -p /var/run /var/lock/{serial,subsys,uucp} -chmod 0770 /var/lock/subsys -chmod 0770 /var/lock/{serial,uucp} -chgrp uucp /var/lock/{serial,uucp} diff --git a/features.in/init/rootfs/image-scripts.d/50-var-run-fix b/features.in/init/rootfs/image-scripts.d/50-var-run-fix new file mode 100755 index 0000000000..57a07b3152 --- /dev/null +++ b/features.in/init/rootfs/image-scripts.d/50-var-run-fix @@ -0,0 +1,9 @@ +#!/bin/sh + +# this was a bunch of dirty complaints +sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||: + +[ ! -L /var/run ] && rm -r /var/run && ln -s ../run /var/run +[ ! -L /var/lock ] && rm -r /var/lock && ln -s ../run/lock /var/lock + +: -- 2.21.0 --------------EF290B6E3886BA29595C5930--