From 7fdac0e72e51363705ab1a9419c4d72b5e35f011 Mon Sep 17 00:00:00 2001 From: phanes Date: Tue, 21 Mar 2023 21:11:40 -0400 Subject: [PATCH] demarcation point from LFS --- configs/etc_dhl-release | 1 + configs/etc_lsb-release | 4 ++++ configs/etc_os-release | 5 +++++ .../{systemd-tuning.bash => system-tuning.bash} | 13 ++++++++++++- rex.project/x86_64/plans/stage4.plan | 2 +- rex.project/x86_64/units/stage4.units | 4 ++-- 6 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 configs/etc_dhl-release create mode 100644 configs/etc_lsb-release create mode 100644 configs/etc_os-release rename rex.project/x86_64/components/stage5/{systemd-tuning.bash => system-tuning.bash} (90%) diff --git a/configs/etc_dhl-release b/configs/etc_dhl-release new file mode 100644 index 0000000..ac848e7 --- /dev/null +++ b/configs/etc_dhl-release @@ -0,0 +1 @@ +pyrois_pre-release_2023-03-21 diff --git a/configs/etc_lsb-release b/configs/etc_lsb-release new file mode 100644 index 0000000..c4646c2 --- /dev/null +++ b/configs/etc_lsb-release @@ -0,0 +1,4 @@ +DISTRIB_ID="Dark Horse Linux" +DISTRIB_RELEASE="20230321_pre-release" +DISTRIB_CODENAME="Christopher M. Punches" +DISTRIB_DESCRIPTION="Pre-Release ALFS-NG" diff --git a/configs/etc_os-release b/configs/etc_os-release new file mode 100644 index 0000000..c976179 --- /dev/null +++ b/configs/etc_os-release @@ -0,0 +1,5 @@ +NAME="Dark Horse Linux" +VERSION="2023-03-21-ALFS-NG-pre-release" +ID=DHLP +PRETTY_NAME="Dark Horse Linux ALFS-NG Pre-release 2023-03-21" +VERSION_CODENAME="Christopher M. Punches" diff --git a/rex.project/x86_64/components/stage5/systemd-tuning.bash b/rex.project/x86_64/components/stage5/system-tuning.bash similarity index 90% rename from rex.project/x86_64/components/stage5/systemd-tuning.bash rename to rex.project/x86_64/components/stage5/system-tuning.bash index 5c92af4..f2fd4e4 100755 --- a/rex.project/x86_64/components/stage5/systemd-tuning.bash +++ b/rex.project/x86_64/components/stage5/system-tuning.bash @@ -5,7 +5,7 @@ # make variables persist in subprocesses for logging function set -a -APPNAME="systemd-tuning" +APPNAME="system-tuning" # the file to log to @@ -90,6 +90,17 @@ logprint "Fixing systemd scope creep on logind.conf" cp -vf ${CONFIGS_DIR}/etc_systemd_logind.conf /etc/systemd/logind.conf assert_zero $? +logprint "Setting Release Files" +cp -vf ${CONFIGS_DIR}/etc_dhl-release /etc/dhl-release +assert_zero $? + +cp -vf ${CONFIGS_DIR}/etc_lsb-release /etc/lsb-release +assert_zero $? + +cp -vf ${CONFIGS_DIR}/etc_os-release /etc/os-release +assert_zero $? + + # re: fstab, since this artifact will boot on an iso, the booting disk # may need to be assumed # deferring this for later testing diff --git a/rex.project/x86_64/plans/stage4.plan b/rex.project/x86_64/plans/stage4.plan index 23079cc..4954f1f 100644 --- a/rex.project/x86_64/plans/stage4.plan +++ b/rex.project/x86_64/plans/stage4.plan @@ -392,7 +392,7 @@ "comment": "8.80" }, { - "name": "systemd tuning", + "name": "system tuning", "dependencies": [ null ], "comment": "9.2" } diff --git a/rex.project/x86_64/units/stage4.units b/rex.project/x86_64/units/stage4.units index 989d260..01dcea2 100644 --- a/rex.project/x86_64/units/stage4.units +++ b/rex.project/x86_64/units/stage4.units @@ -1405,8 +1405,8 @@ "environment": "environments/stage4.env.bash" }, { - "name": "systemd tuning", - "target": "components/stage5/systemd-tuning.bash", + "name": "system tuning", + "target": "components/stage5/system-tuning.bash", "is_shell_command": true, "shell_definition": "bash", "force_pty": true,