Add system-release file

use same issue for core updater and iso

diff --git a/config/rootfiles/common/as86 b/config/rootfiles/common/as86
index b8ad7d16317f20dfc666ec1041a25b89cfac4484..96a23e3c5498c76b7bc19912057f0c599e548354 100644 (file)
--- a/config/rootfiles/common/as86
+++ b/config/rootfiles/common/as86
@@ -1,4 +1,5 @@
 #usr/bin/as86
 #usr/bin/as86_encap
 #var/ipfire/firebuild
+#etc/system-release
 #opt/pakfire/db/core/mine

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 41e6113fc35b98753fdc816ecae22025576bac57..251b287576ffeafc724fabfb440d64cae7481642 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -164,3 +164,4 @@ var/ipfire/wireless
 var/ipfire/xtaccess
 #var/ipfire/xtaccess/config
 var/ipfire/firebuild
+etc/system-release

diff --git a/config/rootfiles/core/28/filelists/files b/config/rootfiles/core/28/filelists/files
index cde8b6199919b6c95a9484b7319cd479b59cbb6c..f8b110abe77df3558dfb3c3795a42e4c9f09451e 100644 (file)
--- a/config/rootfiles/core/28/filelists/files
+++ b/config/rootfiles/core/28/filelists/files
@@ -1,3 +1,5 @@
+etc/system-release
+etc/issue
 bin/probenic.sh
 etc/collectd.conf
 etc/collectd.thermal

diff --git a/config/rootfiles/core/28/update.sh b/config/rootfiles/core/28/update.sh
index 6c61902c3dbb7dd80b56d09f54b4811d9923a910..c7d1fd9fb1a0684e4e49b7351cfeb742c6624bbe 100755 (executable)
--- a/config/rootfiles/core/28/update.sh
+++ b/config/rootfiles/core/28/update.sh
@@ -120,11 +120,5 @@ rm -rf /etc/sysconfig/lm_sensors
 #
 sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
 #
-# Create new issue
-#
-echo IPFire v$NEWVERSION beta2 - www.ipfire.org > /etc/issue
-echo =================================== >> /etc/issue
-echo \\n running on \\s \\r \\m >> /etc/issue
-#
 # This core-update need a reboot
 /usr/bin/logger -p syslog.emerg -t core-upgrade-28 "Upgrade finished. Please reboot... "

diff --git a/make.sh b/make.sh
index 8ba3cdbc695d22f53826a784ff09368944022cb9..c5cd8f01e4f3543a2c3d987017a594e8f18891c4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -622,6 +622,7 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $CORE > $BASEDIR/build/opt/pakfire/db/core/mine
+  echo $NAME $VERSION - Core$CORE > $BASEDIR/build/etc/system-release
 }
 
 buildinstaller() {