[Lunar-commits] <lunar-iso> Generate and install a proper os-release file

[Stefan Wold]

commit e8fb9e41279a82aacbe232b3f658ad2fd98460c5
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Thu, 28 Nov 2013 14:32:09 -0800
URL: https://github.com/lunar-linux/lunar-iso/commit/e8fb9e41279a82aacbe232b3f658ad2fd98460c5

Generate and install a proper os-release file
---
  livecd/template/etc/os-release   | +7/-0     
  lunar-install/sbin/lunar-install | +1/-1     
  mkfiles/iso.mk                   | +1/-1     
  3 files changed, 9 insertions(+), 2 deletions(-)

--- /dev/null
+++ b/livecd/template/etc/os-release
@@ -0,0 +1,7 @@
+NAME="Lunar Linux"
+VERSION="%VERSION% (%CODENAME%)"
+ID=lunar
+VERSION_ID=%VERSION%
+PRETTY_NAME="Lunar Linux %CNAME%"
+ANSI_COLOR="1;34"
+HOME_URL="http://lunar-linux.org/"
--- a/lunar-install/sbin/lunar-install
+++ b/lunar-install/sbin/lunar-install
@@ -1182,8 +1182,8 @@ transfer()
       make_grub_conf
 
       # some more missing files:
-      #cp /etc/lunar.release $TARGET/etc/
       cp /etc/lsb-release $TARGET/etc/
+      cp /etc/os-release $TARGET/etc/
       cp /etc/issue{,.net} $TARGET/etc/
 
       # Some sane defaults
--- a/mkfiles/iso.mk
+++ b/mkfiles/iso.mk
@@ -30,7 +30,7 @@ iso-modules: $(ISO_TARGET)/.iso-modules
 
 
 # Prepare target files
-ISO_ETC_FILES=lsb-release fstab motd issue issue.net
+ISO_ETC_FILES=lsb-release os-release fstab motd issue issue.net
 
 $(ISO_TARGET)/etc/%: $(ISO_SOURCE)/livecd/template/etc/% iso-modules
 	@sed -e 's:%VERSION%:$(ISO_VERSION):g' -e 's:%CODENAME%:$(ISO_CODENAME):g' -e 's:%DATE%:$(ISO_DATE):g' -e 's:%KERNEL%:$(ISO_KERNEL):g' -e 's:%CNAME%:$(ISO_CNAME):g' -e 's:%COPYRIGHTYEAR%:$(ISO_COPYRIGHTYEAR):g' -e 's:%LABEL%:$(ISO_LABEL):' $< > $@