Geaendert:
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Sat, 2 Sep 2006 12:21:49 +0000 (12:21 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Sat, 2 Sep 2006 12:21:49 +0000 (12:21 +0000)
  * redirect-Seite
  * Grub Savedefault und Bootoptionen
  * Pakfire - Fix
Hinzugefuegt:
  * Samba.cgi - experimental

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

16 files changed:
config/grub/grub.conf
config/grub/scsigrub.conf
doc/ChangeLog
doc/packages-list.txt
html/cgi-bin/samba.cgi [new file with mode: 0644]
html/html/redirect.cgi
lfs/clamav
lfs/configroot
lfs/grub
lfs/libogg
lfs/libvorbis
lfs/xampp
lfs/xvid
make.sh
src/ROOTFILES.i386
src/pakfire/lib/check_pak.sh

index 543f976..9688b7c 100644 (file)
@@ -1,47 +1,35 @@
 timeout 10
-#default saved
+default saved
 foreground = 16064e
 background = ffffff
 gfxmenu /grub/message
-#hiddenmenu
-#splashimage (hd0,0)/grub/ipfire.xpm.gz
 title IPFire (1024x768)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=791 splash=silent ro
+  kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
   initrd /initrd.splash
-  #savedefault
+  savedefault 0
 title IPFire (640x480)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=785 splash=silent ro
+  kernel /vmlinuz root=ROOT panic=10 vga=785 splash=silent ro
   initrd /initrd.splash
-  #savedefault
+  savedefault 1
 title IPFire SMP (1024x768)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
   initrd /initrd.splash
-  #savedefault
+  savedefault 2
 title IPFire SMP (640x480)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=785 splash=silent ro
   initrd /initrd.splash
-  #savedefault
-title IPFire (ACPI enabled) (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
-  initrd /initrd.splash
-  #savedefault
-title IPFire (ACPI enabled) (640x480)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=785 splash=silent ro
-  initrd /initrd.splash
-  #savedefault
-title IPFire SMP (ACPI HT enabled) (1024x768)
+  savedefault 3
+title IPFire SMP (Intel Pentium 4) (1024x768)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
   initrd /initrd.splash
-  #savedefault
-title IPFire SMP (ACPI HT enabled) (640x480)
+  savedefault 4
+title IPFire SMP (Intel Pentium 4) (640x480)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=785 splash=silent ro
   initrd /initrd.splash
-  #savedefault
+  savedefault 5
index 9b20e03..91d9f6d 100644 (file)
@@ -1,47 +1,35 @@
 timeout 10
-#default saved
+default saved
 foreground = 16064e
 background = ffffff
 gfxmenu /grub/message
-#hiddenmenu
-#splashimage (hd0,0)/grub/ipfire.xpm.gz
 title IPFire (1024x768)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
+  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=791 splash=silent rw
   initrd /ipfirerd.img
-  #savedefault
+  savedefault 0
 title IPFire (640x480)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=785 splash=silent rw
+  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=785 splash=silent rw
   initrd /ipfirerd.img
-  #savedefault
+  savedefault 1
 title IPFire SMP (1024x768)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
   initrd /ipfirerd-smp.img
-  #savedefault
+  savedefault 2
 title IPFire SMP (640x480)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=785 splash=silent rw
   initrd /ipfirerd-smp.img
-  #savedefault
-title IPFire (ACPI enabled) (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=791 splash=silent rw
-  initrd /ipfirerd.img
-  #savedefault
-title IPFire (ACPI enabled) (640x480)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=785 splash=silent rw
-  initrd /ipfirerd.img
-  #savedefault
-title IPFire SMP (ACPI HT enabled) (1024x768)
+  savedefault 3
+title IPFire SMP (Intel Pentium 4) (1024x768)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=791 splash=silent rw
   initrd /ipfirerd-smp.img
-  #savedefault
-title IPFire SMP (ACPI HT enabled) (640x480)
+  savedefault 4
+title IPFire SMP (Intel Pentium 4) (640x480)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=785 splash=silent rw
   initrd /ipfirerd-smp.img
-  #savedefault
+  savedefault 5
index ac7ac62..4e0c7ba 100644 (file)
@@ -1,4 +1,8 @@
 ------------------------------------------------------------------------
+r265 | ms | 2006-08-30 20:56:53 +0200 (Wed, 30 Aug 2006) | 1 line
+
+Direkt ein Fix fuer eben genannte Sachen...
+------------------------------------------------------------------------
 r264 | ms | 2006-08-30 20:29:15 +0200 (Wed, 30 Aug 2006) | 3 lines
 
 Geaendert:
index 9455b69..d17c481 100644 (file)
@@ -84,6 +84,7 @@
   * fcpci-suse8.2-03.11.02
   * fcron-2.0.2
   * fetchmail-6.3.4
+  * ffmpeg-20051126
   * file-4.16
   * findutils-4.1.20
   * flex-2.5.4a
   * inetutils-1.4.2
   * ipac-ng-1.31
   * ipaddr-1.2
-  * ipfire-logs-2006-08-28-21:09.tgz
+  * ipfire-logs-2006-08-30-01:11.tgz
   * iproute2-2.4.7-now-ss010824
   * iptables-1.3.5
   * iptraf-3.0.0
   * lcms-1.15
   * less-382
   * libcap-1.10
+  * libmad-0.15.1b
   * libmng-1.0.9
   * libnet-1.1.2.1
   * libogg-1.1.3
   * mktemp-1.5
   * mldonkey-2.7.7
   * modutils-2.4.27
+  * mpeg2dec-20050802
   * mpg123-0.59r
   * mtools-3.9.9
   * nagios-2.5
   * util-linux-2.12r
   * vim-6.3
   * vlan.1.9
+  * vlc-0.8.5
   * wget-1.10.2
   * wput-0.6
   * xampp-linux-1.5.3a
   * xinetd-2.3.14
   * xmbmon205
+  * xvidcore-1.1.0
   * zaptel-1.2.7
   * zlib-1.2.3
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
new file mode 100644 (file)
index 0000000..ecdd256
--- /dev/null
@@ -0,0 +1,274 @@
+#!/usr/bin/perl
+#
+# IPFire CGIs
+#
+# This code is distributed under the terms of the GPL
+#
+# (c) The IPFire Team
+#
+
+use strict;
+# enable only the following on debugging purpose
+use warnings;
+use CGI::Carp 'fatalsToBrowser';
+
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+
+my %sambasettings = ();
+my %checked = ();
+my %netsettings = ();
+my $message = "";
+my $errormessage = "";
+my $shareentry = "";
+my @shares = ();
+my @shareline = ();
+my @proto = ();
+my %selected= () ;
+my $sharefile = "/var/ipfire/samba/shares";
+&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
+
+my %servicenames =
+(
+       'SMB Daemon' => 'smbd',
+       'NetBIOS Nameserver' => 'nmbd',
+       'Winbind Daemon' => 'winbindd'
+);
+
+&Header::showhttpheaders();
+
+$sambasettings{'ENABLED'} = 'off';
+$sambasettings{'EDIT'} = 'no';
+$sambasettings{'VALID'} = 'yes';
+$sambasettings{'WORKGRP'} = 'homeip.net';
+$sambasettings{'NETBIOSNAME'} = 'IPFIRE';
+$sambasettings{'SRVSTRING'} = 'Samba Server %v running on IPFire 2.0';
+$sambasettings{'INTERFACES'} = '';
+$sambasettings{'SECURITY'} = 'share';
+$sambasettings{'OSLEVEL'} = '20';
+$sambasettings{'PDC'} = 'off';
+$sambasettings{'WINSSERV'} = '';
+$sambasettings{'WINS'} = 'off';
+### Values that have to be initialized
+$sambasettings{'ACTION'} = '';
+
+&General::readhash("${General::swroot}/samba/settings", \%sambasettings);
+&Header::getcgihash(\%sambasettings);
+
+&Header::openpage('Samba', 1, '');
+&Header::openbigbox('100%', 'left', '', $errormessage);
+
+############################################################################################################################
+############################################################################################################################
+
+if ($sambasettings{'ACTION'} eq $Lang::tr{'save'})
+{
+       &General::writehash("${General::swroot}/samba/settings", \%sambasettings);
+}
+
+&General::readhash("${General::swroot}/samba/settings", \%sambasettings);
+
+if ($errormessage) {
+       &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+       print "<class name='base'>$errormessage\n";
+       print "&nbsp;</class>\n";
+       &Header::closebox();
+}
+
+$checked{'PDC'}{'on'} = '';
+$checked{'PDC'}{'off'} = '';
+$checked{'PDC'}{"$sambasettings{'PDC'}"} = 'checked';
+$checked{'WINS'}{'on'} = '';
+$checked{'WINS'}{'off'} = '';
+$checked{'WINS'}{"$sambasettings{'WINS'}"} = 'checked';
+
+############################################################################################################################
+############################################################################################################################
+
+&Header::openbox('100%', 'center', 'Samba');
+print <<END
+       <table width='400px' cellspacing='0'>
+END
+;
+       if ( $message ne "" ) {
+               print "<tr><td colspan='3' align='center'><font color='red'>$message</font>";
+       }
+
+       my $lines = 0;
+       my $key = '';
+       foreach $key (sort keys %servicenames)
+       {
+               if ($lines % 2) {
+                       print "<tr bgcolor='${Header::table1colour}'>\n"; }
+               else {
+                       print "<tr bgcolor='${Header::table2colour}'>\n"; }
+               print "<td align='left'>$key</td>\n";
+               my $shortname = $servicenames{$key};
+               my $status = &isrunning($shortname);
+               print "$status\n";
+               print <<END
+                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                               <input type='hidden' name='ACTION' value='restart $shortname'>
+                               <input type='image' src='/images/reload.gif'>
+                       </form></td>
+END
+;
+               print "</tr>\n";
+               $lines++;
+       }
+       print <<END
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+               <tr><td><b>Alle Dienste:</b></td><td colspan='2'>
+               <input type='submit' name='ACTION' value='Start' /> 
+               <input type='submit' name='ACTION' value='Stop' /> 
+               <input type='submit' name='ACTION' value='$Lang::tr{'restart'}' />
+               </td></tr></form>
+       </table>
+       <hr>
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='500px'>
+       <tr><td colspan='2' align='left'><b>Basisoptionen</b>
+       <tr><td align='left'>Workgroup:<td><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}'>
+       <tr><td align='left'>NetBIOS-Name:<td><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}'>
+       <tr><td align='left'>Server-String:<td><input type='text' name='SRVSTRING' value='$sambasettings{'SRVSTRING'}'>
+       <tr><td align='left'>Interfaces:<td><select name='INTERFACES'>
+                                                       <option value='$netsettings{'GREEN_DEV'}'>GREEN</option>
+END
+;
+                                               if (&Header::blue_used()){
+                                                       print <<END
+                                                       <option value='$netsettings{'BLUE_DEV'}'>BLUE</option>
+                                                       <option value='$netsettings{'GREEN_DEV'},$netsettings{'BLUE_DEV'}'>GREEN & BLUE</option>
+END
+;
+                                               }
+       print <<END
+</select>
+
+       <tr><td colspan='2' align='left'><b>Sicherheitsoptionen</b>
+       <tr><td align='left'>Security:<td><select name='SECURITY'>
+                                                       <option value='share'>SHARE</option>
+                                                       <option value='user'>USER</option>
+                                                       <option value='server'>SERVER</option>
+                                                       <option value='domain'>DOMAIN</option>
+                                               </select>
+
+       <tr><td colspan='2' align='left'><b>Browsingoptionen</b>
+       <tr><td align='left'>OS Level:<td><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}'>
+       <tr><td align='left'>Primary Domain Controller:<td>on   <input type='radio' name='PDC' value='on' $checked{'PDC'}{'on'}>/
+                                                                       <input type='radio' name='PDC' value='off' $checked{'PDC'}{'off'}> off
+
+       <tr><td colspan='2' align='left'><b>WINS-Optionen</b>
+       <tr><td align='left'>WINS-Server:<td><input type='text' name='WINSSRV' value='$sambasettings{'WINSSRV'}'>
+       <tr><td align='left'>WINS-Support:<td>on        <input type='radio' name='WINS' value='on' $checked{'WINS'}{'on'}>/
+                                                       <input type='radio' name='WINS' value='off' $checked{'WINS'}{'off'}> off
+
+       <tr><td colspan='2' align='right'><input type='submit' name='ACTION' value=$Lang::tr{'save'}>
+       </table>
+       </form>
+END
+;
+&Header::closebox();
+
+&Header::openbox('100%', 'center', 'Shares');
+
+print <<END
+       <table width='500'>
+       <tr><th width='40%'>Name der Freigabe<th width='40%'>Pfad<th width='20%'>Optionen
+END
+;
+       open( FILE, "< $sharefile" ) or die "Unable to read $sharefile";
+       @shares = <FILE>;
+       close FILE;
+       foreach $shareentry (sort @shares)
+       {
+               @shareline = split( /\;/, $shareentry );
+               print <<END
+               <tr><td align='center' bgcolor='#EAEAEA'><b>$shareline[0]</b>
+                   <td align='center' bgcolor='#EAEAEA'>$shareline[2]
+                   <td align='right'  bgcolor='#EAEAEA'>
+                       <table border='0'><tr>
+END
+;
+               if ($shareline[1] eq 'enabled') {
+                       print <<END
+                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                       <input type='hidden' name='NAME' value='shareline[0]'>
+                                       <input type='hidden' name='ACTION' value='disable'>
+                                       <input type='image' alt='Ausschalten' src='/images/on.gif'>
+                               </form>
+END
+;
+               } elsif ($shareline[1] eq 'disabled') {
+                       print <<END
+                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                       <input type='hidden' name='NAME' value='shareline[0]'>
+                                       <input type='hidden' name='ACTION' value='enable'>
+                                       <input type='image' alt='Einschalten' src='/images/off.gif'>
+                               </form>
+END
+;
+               }
+               print <<END
+                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                               <input type='hidden' name='NAME' value='shareline[0]'>
+                               <input type='hidden' name='ACTION' value='Bearbeiten'>
+                               <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                       </form>
+                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                               <input type='hidden' name='NAME' value='shareline[0]'>
+                               <input type='hidden' name='ACTION' value='Loeschen'>
+                               <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                       </form>
+                       </table>
+END
+;
+       }
+       print <<END
+       <tr><td colspan='8' align='right' valign='middle'><b>Legende:</b>&nbsp;&nbsp;<img src='/images/edit.gif'>&nbsp;Freigabe bearbeiten | <img src='/images/delete.gif'>&nbsp;Freigabe loeschen &nbsp;
+       </table>
+END
+;
+
+&Header::closebox();
+
+&Header::closebigbox();
+&Header::closepage();
+
+############################################################################################################################
+############################################################################################################################
+
+sub isrunning
+{
+       my $cmd = $_[0];
+       my $status = "<td bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
+       my $pid = '';
+       my $testcmd = '';
+       my $exename;
+
+       $cmd =~ /(^[a-z]+)/;
+       $exename = $1;
+
+       if (open(FILE, "/var/run/${cmd}.pid"))
+       {
+               $pid = <FILE>; chomp $pid;
+               close FILE;
+               if (open(FILE, "/proc/${pid}/status"))
+               {
+                       while (<FILE>)
+                       {
+                               if (/^Name:\W+(.*)/) {
+                                       $testcmd = $1; }
+                       }
+                       close FILE;
+                       if ($testcmd =~ /$exename/)
+                       {
+                               $status = "<td bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
+                       }
+               }
+       }
+
+       return $status;
+}
+
index 0be18ed..6c78e31 100644 (file)
@@ -42,54 +42,37 @@ print <<END
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
 <title>ACCESS MESSAGE</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 
+<body>
+<table width="100%" height='100%' border="0">
+<tr>
+               <td colspan='3' width='100%' height='130' align="center" background="http://$netsettings{'GREEN_ADDRESS'}:81//images/background.gif">
+<tr>           <td width='10%'><td align='center' bgcolor='#CC000000' width='80%'><font face="verdana, arial, sans serif" color="#FFFFFF" size="5">
+                                       <b>$msgtext1</b>
+                                       </font>
+               <td width='10%'>
 END
 ;
 
-if (($filtersettings{'ENABLE_JPEG'} eq 'on') && (-e "/home/httpd/html/images/urlfilter/logo_ipfire.gif"))
+if (!($category eq ""))
 {
-print <<END
-<body background="http://$netsettings{'GREEN_ADDRESS'}:81//images/urlfilter/logo_ipfire.gif" bgcolor="#FFFFFF">
-END
-;
-} else {
-print <<END
-<img src="http://$netsettings{'GREEN_ADDRESS'}:81//images/logo_ipfire.gif" ALT="IPFire-Logo">
-<body bgcolor="#455B72">
+       print <<END
+       <tr>            <td colspan='3' align='center'>
+                               <font face="verdana, arial, sans serif" color="#CC000000" size="1">
+                                       <b>$category</b>
+                               </font>
 END
 ;
 }
-
 print <<END
-
-
-<center>
-
-<table width="80%" cellspacing="10" cellpadding="5" border="1">
-<tr>
-               <td nowrap align="right" background="http://$netsettings{'GREEN_ADDRESS'}:81//images/urlfilter/bgcool.gif">
-               <font face="verdana, arial, sans serif" color="#CC000000" size="1">
-               <b> INFO: $category</b>
-               </font>
-       </td>
-</tr>
 <tr>
-       <td bgcolor="#F4F4F4" align="center">
-               <table width="100%" cellspacing="20" cellpadding="18" border="1">
-                       <tr>
-                               <td nowrap align="center" background="http://$netsettings{'GREEN_ADDRESS'}:81//images/urlfilter/bgcool.gif">
-                                       <font face="verdana, arial, sans serif" color="#CC000000" size="5">
-                                       <b>$msgtext1</b>
-                                       </font>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td bgcolor="#E2E2E2" align="center">
-                                       <font face="verdana, arial, sans serif" color="#000000" size="4">
-                                       <b>$msgtext2</b>
-                                       </font>
-                                       <font face="verdana,arial,sans serif" color="#000000" size="2">
+                       <td colspan='3' align="center">
+                               <font face="verdana, arial, sans serif" color="#000000" size="4">
+                               <b>$msgtext2</b>
+                               </font>
+                               <font face="verdana,arial,sans serif" color="#000000" size="2">
 END
 ;
 
@@ -112,29 +95,16 @@ END
 print <<END
                                        <br><p>$msgtext3
                                        </font>
-                               </td>
-                       </tr>
-       </td>
-</tr>
-</table>
 
 <tr>
-       <td nowrap align="right" background="http://$netsettings{'GREEN_ADDRESS'}:81//images/urlfilter/bgcool.gif">
+       <td colspan='3' height='60%' valign="bottom" align="right">
                <font face="verdana,arial,sans serif" color="#656565" size="1">Web Filtering by
                </font>
                <a href="http://www.ipfire.eu" target="_blank"><b>
-               <font face="verdana,arial,sans serif" color="#656565" size="1">IPFire</b></a> and
-               <a href="http://www.squidguard.org" target="_blank"><b>
-               <font face="verdana,arial,sans serif" color="#656565" size="1">SquidGuard
-               </font></b></a>
-       </td>
-</tr>
+               <font face="verdana,arial,sans serif" color="#656565" size="1">IPFire</b></a>
+               </font>
 
 </table>
-
-<img src="http://$netsettings{'GREEN_ADDRESS'}:81//images/urlfilter/bg_cool_tux.jpg">
-</center>
-
 </body>
 
 </html>
index 3eb67fe..e1379d2 100644 (file)
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
index 8c96282..818c7ea 100644 (file)
@@ -86,7 +86,7 @@ $(TARGET) :
        cp $(DIR_SRC)/config/cfgroot/nfs-server                 $(CONFIG_ROOT)/nfs/nfs-server
        cp $(DIR_SRC)/config/cfgroot/p2protocols                        $(CONFIG_ROOT)/outgoing/p2protocols
        cp $(DIR_SRC)/config/cfgroot/proxy-acl                  $(CONFIG_ROOT)/proxy/acl-1.4
-       cp $(DIR_SRC)/config/qos/makeqosscripts.pl              $(CONFIG_ROOT)/qos/bin/makeqosscripts.pl
+       cp $(DIR_SRC)/config/qos/*                                      $(CONFIG_ROOT)/qos/bin/
        cp $(DIR_SRC)/config/cfgroot/ssh-settings                       $(CONFIG_ROOT)/remote/settings
        cp $(DIR_SRC)/config/cfgroot/xtaccess-config            $(CONFIG_ROOT)/xtaccess/config
        cp $(DIR_SRC)/config/cfgroot/time-settings              $(CONFIG_ROOT)/time/settings
index d080052..50f4151 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -139,6 +139,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        done
 
        install -m 0755 $(DIR_SRC)/src/install+setup/install/grubbatch /boot/grub
+       /usr/sbin/grub-set-default 0
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
index e88a0d1..d4b9ad4 100644 (file)
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libogg
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
index a98011b..82165f3 100644 (file)
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libvorbis
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
index 6ed5b7f..2e98283 100644 (file)
--- a/lfs/xampp
+++ b/lfs/xampp
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = /opt/lampp
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = xampp
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
index b7dbba9..1e03b30 100644 (file)
--- a/lfs/xvid
+++ b/lfs/xvid
@@ -33,8 +33,8 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = postfix
-PAK_VER    = ipfire-beta1
+PROG       = xvid
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
diff --git a/make.sh b/make.sh
index b466869..e2cf36b 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -867,7 +867,7 @@ buildpackages() {
        fi
   done
   cd $BASEDIR/packages; ls -w1 *.ipfire | awk -F ".ipfire" '{ print $1 }' > $BASEDIR/packages/packages_list.txt
-  echo "###EOF###" >> $BASEDIR/packages/packages_list.txt
+  echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
 
index 81dd377..d183ffd 100644 (file)
@@ -1268,6 +1268,7 @@ boot/grub/grubbatch
 boot/grub/ipfire.xpm.gz
 boot/grub/scsigrub.conf
 boot/grub/message
+boot/grub/default
 #usr/bin/mbchk
 usr/sbin/grub
 usr/sbin/grub-install
index 2339d6a..3f5c083 100644 (file)
@@ -52,11 +52,10 @@ do
  vers=${vers%%_*}
  vers=${vers%% *}
  ipfver=${zeile#*_*}
- # Testen ob aktuelle Verson schon installiert ist
- # Erst alte Paket Vorschläge löschen
  /bin/rm -f $DB_DIR/${name}
- /bin/echo "VER=${vers}" > $DB_DIR/${name}
- /bin/echo "IPFVER=${ipfver}" >> $DB_DIR/${name}
+ /bin/echo -e VER=\"${vers}\" > $DB_DIR/${name}
+ /bin/echo -e IPFVER=\"${ipfver}\" >> $DB_DIR/${name}
+ cat $DB_DIR/${name} | tr -d "\015" > $DB_DIR/${name}
 done
 
 # Löschen der Hilfslisten