From 90545ed4384c46b0432a64dc0ed3ccdd3eb9a521 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Sun, 19 Jun 2022 20:17:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20sys-apps/systemd-utils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1-merge/sys-apps/systemd-utils/.calculate_directory | 2 ++ .../udev => sys-apps/systemd-utils}/70-persistent-net.rules | 0 .../systemd-utils}/70-persistent-net.rules.remove | 0 .../3_ac_install_live/1-merge/sys-fs/udev/.calculate_directory | 2 -- 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/systemd-utils/.calculate_directory rename profiles/templates/3.6/3_ac_install_live/1-merge/{sys-fs/udev => sys-apps/systemd-utils}/70-persistent-net.rules (100%) rename profiles/templates/3.6/3_ac_install_live/1-merge/{sys-fs/udev => sys-apps/systemd-utils}/70-persistent-net.rules.remove (100%) delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev/.calculate_directory diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/systemd-utils/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/systemd-utils/.calculate_directory new file mode 100644 index 000000000..fcb1b2eeb --- /dev/null +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/systemd-utils/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate mergepkg(sys-apps/systemd-utils)!=||mergepkg(sys-fs/udev)!=||mergepkg(sys-fs/eudev)!= append=skip + diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev/70-persistent-net.rules b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/systemd-utils/70-persistent-net.rules similarity index 100% rename from profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev/70-persistent-net.rules rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/systemd-utils/70-persistent-net.rules diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev/70-persistent-net.rules.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/systemd-utils/70-persistent-net.rules.remove similarity index 100% rename from profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev/70-persistent-net.rules.remove rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/systemd-utils/70-persistent-net.rules.remove diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev/.calculate_directory deleted file mode 100644 index 3d5d15eb7..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate mergepkg(sys-fs/udev)!=||mergepkg(sys-fs/eudev)!= path=/etc name=modprobe.d -