Das Build wird jetzt im Browserkopf angezeigt

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@191 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 659d41a687e2111b6c56a5dd7b8f229a0e42b666..805489c67cf76f46d9095ac669879f394d7e31d5 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -87,6 +87,13 @@ if ( -d "/var/ipfire/langs/${language}/" ) {
     };
 };
 
+### Read IPFire Buildversion
+$FIREBUILD = "Datei firebuild nicht gefunden\n";
+if (open(MYFile, "<${swroot}/firebuild")) {
+    $FIREBUILD = <MYFile>;
+    $FIREBUILD = "(Build: $FIREBUILD)";
+    close(_File);
+};
 
 require "${swroot}/langs/en.pl";
 require "${swroot}/langs/${language}.pl";
@@ -714,7 +721,7 @@ sub openpage {
     my $h2 = gettitle($menu);
     my $helpuri = get_helpuri();
 
-    $title = "IPFire - $title";
+    $title = "IPFire - $title $FIREBUILD";
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
         $title =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; 
     }

diff --git a/make.sh b/make.sh
index 5fe00355c7d83d5ef4b0f3d9d6bb4de3ffd580dd..eea54f42cc5e5af6fefa097c4417a4d8ffcf7964 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -33,6 +33,12 @@
   KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
   MACHINE=`uname -m`
 
+  # Setzen des IPFire Builds
+  if [ -e ./.svn ]; then
+    FIREBUILD=`cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p'`
+#    VERSION="$VERSION (Build:$FIREBUILD)"
+  fi
+
   # Debian specific settings
   if [ ! -e /etc/debian_version ]; then
        FULLPATH=`which $0`
@@ -900,10 +906,10 @@ build)
        buildipcop
 
        # Setzen des IPFire Builds
-       if [ -e ./.svn ]; then
-               cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p' > $LFS/home/httpd/html/firebuild
+       if [ $FIREBUILD ]; then
+               echo "$FIREBUILD" > $CONFIG_ROOT/firebuild
        else
-               echo "_(OvO)_" > $LFS/home/httpd/html/firebuild
+               echo "_(OvO)_" > $CONFIG_ROOT/firebuild
        fi
 
        buildinstaller