[Lunar-commits] <lunar-iso> Install a proper systemd os-release file

[Stefan Wold]

commit a536953dc407cd4a047001d806a480dad05478bd
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sun, 12 Jan 2014 09:28:36 -0800
URL: https://github.com/lunar-linux/lunar-iso/commit/a536953dc407cd4a047001d806a480dad05478bd

Install a proper systemd os-release file
---
  livecd/template/etc/os-release   | +7/-0     
  lunar-install/sbin/lunar-install | +2/-2     
  mkfiles/iso.mk                   | +1/-1     
  3 files changed, 10 insertions(+), 3 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
@@ -6,7 +6,7 @@
 # portions Copyright 2002 by rodzilla                       #
 # portions Copyright 2003-2004 by tchan, kc8apf             #
 # portions Copyright 2004-2007 by Auke Kok                  #
-# portions Copyright 2008-2010 by Stefan Wold               #
+# portions Copyright 2008-2014 by Stefan Wold               #
 #                                                           #
 #############################################################
 #                                                           #
@@ -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):' $< > $@