live, init: move 65-os-release from live to init

Install /etc/*-release files if needed. Reported-by: Ivan A. Melnikov <iv@altlinux.org>

live, init: move 65-os-release from live to init
efa57b91 · Anton Midyukov · Michael Shigorin · 5e20cec7 · efa57b91 · efa57b91
Commit efa57b91 authored Nov 04, 2019 by Anton Midyukov Committed by Michael Shigorin Jan 13, 2020
3 changed files
--- a/features.in/init/rescue/image-scripts.d/65-os-release
+++ b/features.in/init/rescue/image-scripts.d/65-os-release
+#!/bin/sh
+# Install /etc/*-release files if needed
+if [ -d /usr/share/branding-data-current ]; then
+	[ -e /etc/altlinux-release ] ||
+	cp -at /etc -- \
+		/usr/share/branding-data-current/release/altlinux-release
+	[ -e /etc/os-release ] ||
+	cp -at /etc -- \
+		/usr/share/branding-data-current/release/os-release
+fi
--- a/features.in/init/rootfs/image-scripts.d/65-os-release
+++ b/features.in/init/rootfs/image-scripts.d/65-os-release
+#!/bin/sh
+# Install /etc/*-release files if needed
+if [ -d /usr/share/branding-data-current ]; then
+	[ -e /etc/altlinux-release ] ||
+	cp -at /etc -- \
+		/usr/share/branding-data-current/release/altlinux-release
+	[ -e /etc/os-release ] ||
+	cp -at /etc -- \
+		/usr/share/branding-data-current/release/os-release
+fi
--- a/features.in/live/live/image-scripts.d/65-os-release
+++ b/features.in/live/live/image-scripts.d/65-os-release
-#!/bin/sh
-# Install /etc/*-release files on live if needed
-if [ -d /usr/share/branding-data-current ] && \
-	! [ -e /etc/altlinux-release ] && \
-	! [ -e /etc/os-release ]; then
-    cp -a /usr/share/branding-data-current/release/*-release /etc/
-fi