From 54b39c89da33fa13ae712ea7f196c3f612275455 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sun, 25 Jun 2023 15:43:39 +0200 Subject: [PATCH] remove os-release from cpio.sh --- usr/lib/archboot/cpio.sh | 10 ---------- usr/share/archboot/base/etc/os-release | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/usr/lib/archboot/cpio.sh b/usr/lib/archboot/cpio.sh index 5b9b43fb2..79644b79b 100644 --- a/usr/lib/archboot/cpio.sh +++ b/usr/lib/archboot/cpio.sh @@ -355,16 +355,6 @@ initialize_buildroot() { # mount tables ln -s ../proc/self/mounts "$buildroot/etc/mtab" : >"$buildroot/etc/fstab" - # add os-release for systemd - if [[ -e /etc/os-release ]]; then - if [[ -L /etc/os-release ]]; then - osreleasefile="$(realpath -- /etc/os-release)" - install -Dm0644 "$osreleasefile" "${buildroot}${osreleasefile}" - cp -adT /etc/os-release "${buildroot}/etc/os-release" - else - install -Dm0644 /etc/os-release "${buildroot}/etc/os-release" - fi - fi # add a blank ld.so.conf to keep ldconfig happy : >"$buildroot/etc/ld.so.conf" printf '%s' "$workdir" diff --git a/usr/share/archboot/base/etc/os-release b/usr/share/archboot/base/etc/os-release index bb9c05e9d..f7cef7b5b 100644 --- a/usr/share/archboot/base/etc/os-release +++ b/usr/share/archboot/base/etc/os-release @@ -1,5 +1,5 @@ -NAME="Archboot - Arch Linux" -PRETTY_NAME="Archboot - Arch Linux" +NAME="Archboot" +PRETTY_NAME="Archboot" ID=arch BUILD_ID=rolling ANSI_COLOR="38;2;23;147;209"