From: Jan Paul Tuecking
Date: Sun, 5 Dec 2010 18:20:58 +0000 (+0100)
Subject: Read license agreement out of file.
X-Git-Tag: v2.9-beta1~23^2~6
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=7274a673f0e2941c17c0745285d2f46f97728db3
Read license agreement out of file.
---
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index c07182ec6b..5c0376aeee 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -454,7 +454,7 @@ END
print <$Lang::tr{'needreboot'}!";
+ print "
$Lang::tr{'needreboot'}!";
}
} else {
my $message='';
@@ -484,632 +484,19 @@ END
else {
&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
print <
-
+END
+;
+if (`find /usr/share/doc/licenses/GPLv3 2>/dev/null`) {
+ print ''
+}
+else {
+ print '
GNU GENERAL PUBLIC LICENSE
'
+}
+print <
- $Lang::tr{'gpl unofficial translation of the general public license v3'}
+ $Lang::tr{'gpl unofficial translation of the general public license v3'}
END
diff --git a/lfs/stage2 b/lfs/stage2
index b2be2d6ca7..5f038c3250 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -108,4 +108,8 @@ $(TARGET) :
# A small hack to include /root to the iso but not all of it's files.
touch /root/ipfire
+ # License agreement
+ -mkdir -pv /usr/share/doc/licenses/
+ cp -vf $(DIR_SRC)/doc/COPYING /usr/share/doc/licenses/GPLv3
+
@$(POSTBUILD)