Bash bearbeitet, da der Bootpromt nicht richtig arbeitete.

Kleiner Fix damit man ohne prefetching bauen kann.

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

diff --git a/config/rootfiles/common/coreutils b/config/rootfiles/common/coreutils
index bfd47de10899e8c45250f9d09ae0ed6698f3f9b1..268bd053b0532a5e1d75416dd1f16c14ac4d9e00 100644 (file)
--- a/config/rootfiles/common/coreutils
+++ b/config/rootfiles/common/coreutils
@@ -30,7 +30,7 @@ usr/bin/basename
 #usr/bin/csplit
 usr/bin/cut
 #usr/bin/dir
 #usr/bin/csplit
 usr/bin/cut
 #usr/bin/dir

-#usr/bin/dircolors
+usr/bin/dircolors

 usr/bin/dirname
 usr/bin/du
 usr/bin/env
 usr/bin/dirname
 usr/bin/du
 usr/bin/env

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index f09b35f063e79d9dd72682e13f2b33687845c406..06019f98b31871afba51e0a82e8c0c4b8eb5a9f1 100644 (file)
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -38,9 +38,9 @@ my %mainsettings=();
 my %timesettings=();
 my $setting = "${General::swroot}/dhcp/settings";
 our $filename1 = "${General::swroot}/dhcp/advoptions";         # Field separator is TAB in this file (comma is standart)
 my %timesettings=();
 my $setting = "${General::swroot}/dhcp/settings";
 our $filename1 = "${General::swroot}/dhcp/advoptions";         # Field separator is TAB in this file (comma is standart)

-                                                       # because we need commas in the some data
+                                                                       # because we need commas in the some data

 our $filename2 = "${General::swroot}/dhcp/fixleases";
 our $filename2 = "${General::swroot}/dhcp/fixleases";

-our $filename3 = "${General::swroot}/dhcp/advoptions-list"; # Describe the allowed syntax for dhcp options
+our $filename3 = "${General::swroot}/dhcp/advoptions-list";    # Describe the allowed syntax for dhcp options

 my $errormessage = '';
 my $warnNTPmessage = '';
 my @nosaved=();
 my $errormessage = '';
 my $warnNTPmessage = '';
 my @nosaved=();


@@ -66,6 +66,8 @@ foreach my $itf (@ITFs) {
     $dhcpsettings{"DNS2_${itf}"} = '';
     $dhcpsettings{"NTP1_${itf}"} = '';
     $dhcpsettings{"NTP2_${itf}"} = '';
     $dhcpsettings{"DNS2_${itf}"} = '';
     $dhcpsettings{"NTP1_${itf}"} = '';
     $dhcpsettings{"NTP2_${itf}"} = '';

+    $dhcpsettings{"NEXT_${itf}"} = '';
+    $dhcpsettings{"FILE_${itf}"} = '';

 }
 
 $dhcpsettings{'SORT_FLEASELIST'} = 'FIPADDR';
 }
 
 $dhcpsettings{'SORT_FLEASELIST'} = 'FIPADDR';


@@ -206,7 +208,12 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) {
                        goto ERROR;
                }               
            }
                        goto ERROR;
                }               
            }

-
+           if ($dhcpsettings{"NEXT_${itf}"}) {
+               if (!(&General::validip($dhcpsettings{"NEXT_${itf}"}))) {
+                       $errormessage = "next-server on ${itf}: " . $Lang::tr{'invalid ip'};
+                       goto ERROR;
+               }
+           }

            if ($dhcpsettings{"NTP1_${itf}"}) {
                if (!(&General::validip($dhcpsettings{"NTP1_${itf}"}))) {
                        $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid primary ntp'};
            if ($dhcpsettings{"NTP1_${itf}"}) {
                if (!(&General::validip($dhcpsettings{"NTP1_${itf}"}))) {
                        $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid primary ntp'};


@@ -563,6 +570,11 @@ print <<END
     <td><input type='text' name='WINS1_${itf}' value='$dhcpsettings{"WINS1_${itf}"}' /></td>
     <td class='base'>$Lang::tr{'secondary wins server address'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
     <td><input type='text' name='WINS2_${itf}' value='$dhcpsettings{"WINS2_${itf}"}' /></td>
     <td><input type='text' name='WINS1_${itf}' value='$dhcpsettings{"WINS1_${itf}"}' /></td>
     <td class='base'>$Lang::tr{'secondary wins server address'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
     <td><input type='text' name='WINS2_${itf}' value='$dhcpsettings{"WINS2_${itf}"}' /></td>

+</tr><tr>
+    <td class='base'>next-server:&nbsp;<img src='/blob.gif' alt='*' /></td>
+    <td><input type='text' name='NEXT_${itf}' value='$dhcpsettings{"NEXT_${itf}"}' /></td>
+    <td class='base'>filename:&nbsp;<img src='/blob.gif' alt='*' /></td>
+    <td><input type='text' name='FILE_${itf}' value='$dhcpsettings{"FILE_${itf}"}' /></td>

 </tr>
 </table>
 <hr />
 </tr>
 </table>
 <hr />


@@ -1136,6 +1148,8 @@ sub buildconf {
            print FILE "\toption netbios-name-servers " . $dhcpsettings{"WINS1_${itf}"}     if ($dhcpsettings{"WINS1_${itf}"});
            print FILE ", " . $dhcpsettings{"WINS2_${itf}"}                            if ($dhcpsettings{"WINS2_${itf}"});
            print FILE ";\n"                                                           if ($dhcpsettings{"WINS1_${itf}"});
            print FILE "\toption netbios-name-servers " . $dhcpsettings{"WINS1_${itf}"}     if ($dhcpsettings{"WINS1_${itf}"});
            print FILE ", " . $dhcpsettings{"WINS2_${itf}"}                            if ($dhcpsettings{"WINS2_${itf}"});
            print FILE ";\n"                                                           if ($dhcpsettings{"WINS1_${itf}"});

+           print FILE "\tnext-server " . $dhcpsettings{"NEXT_${itf}"} . ";\n" if ($dhcpsettings{"NEXT_${itf}"});
+           print FILE "\tfilename \"" . $dhcpsettings{"FILE_${itf}"} . "\";\n" if ($dhcpsettings{"FILE_${itf}"});

            print FILE "\tdefault-lease-time " . ($dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"} * 60). ";\n";
            print FILE "\tmax-lease-time "     . ($dhcpsettings{"MAX_LEASE_TIME_${itf}"} * 60)    . ";\n";
            print FILE "\tallow bootp;\n" if ($dhcpsettings{"ENABLEBOOTP_${itf}"} eq 'on');
            print FILE "\tdefault-lease-time " . ($dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"} * 60). ";\n";
            print FILE "\tmax-lease-time "     . ($dhcpsettings{"MAX_LEASE_TIME_${itf}"} * 60)    . ";\n";
            print FILE "\tallow bootp;\n" if ($dhcpsettings{"ENABLEBOOTP_${itf}"} eq 'on');

diff --git a/lfs/bash b/lfs/bash
index ad89485159de3f2f7dc00a464482a5ae5f795e71..693d2da0a32e770ff44eb74e1a6f535c4f221a55 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -89,6 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fixes-8.patch
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fixes-8.patch

+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-login.patch

        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install

diff --git a/lfs/linux b/lfs/linux
index 97a3f6f6f0f5123014ade17d624abc918eed2d96..b7417878f368ec092eeef51e3352cd38ab95c526 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -48,6 +48,7 @@ endif
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \

+       squashfs3.0.tar.gz \

        openswan-2.4.7.kernel-2.6-natt.patch.gz \
        openswan-2.4.7.kernel-2.6-klips.patch.gz \
        iptables-1.3.5.tar.bz2 \
        openswan-2.4.7.kernel-2.6-natt.patch.gz \
        openswan-2.4.7.kernel-2.6-klips.patch.gz \
        iptables-1.3.5.tar.bz2 \


@@ -68,6 +69,7 @@ kbc_option_2420.patch                 = $(URL_IPFIRE)/kbc_option_2420.patch
 net4801.kernel.patch_2.4.31                    = $(URL_IPFIRE)/net4801.kernel.patch_2.4.31
 netfilter-layer7-v2.6.tar.gz           = $(URL_IPFIRE)/netfilter-layer7-v2.6.tar.gz
 patch-2.6.16-nath323-1.3.bz2           = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 net4801.kernel.patch_2.4.31                    = $(URL_IPFIRE)/net4801.kernel.patch_2.4.31
 netfilter-layer7-v2.6.tar.gz           = $(URL_IPFIRE)/netfilter-layer7-v2.6.tar.gz
 patch-2.6.16-nath323-1.3.bz2           = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2

+squashfs3.0.tar.gz                             = $(URL_IPFIRE)/squashfs3.0.tar.gz

 
 $(DL_FILE)_MD5                                 = 50695965725367f39007023feac5e256
 patch-$(PATCHLEVEL).gz_MD5                             = 1355ebc25ea57df398d20e1c1726ec9b
 
 $(DL_FILE)_MD5                                 = 50695965725367f39007023feac5e256
 patch-$(PATCHLEVEL).gz_MD5                             = 1355ebc25ea57df398d20e1c1726ec9b


@@ -79,6 +81,7 @@ kbc_option_2420.patch_MD5                             = 6d37870344f7fcf97ace1fbf43323c60
 net4801.kernel.patch_2.4.31_MD5                        = c7d64e3caedb2f2b10e1c11db7f73a04
 netfilter-layer7-v2.6.tar.gz_MD5                       = 58135cd1aafaf4ae2fa478159206f064
 patch-2.6.16-nath323-1.3.bz2_MD5                       = f926409ff703a307baf54b57ab75d138
 net4801.kernel.patch_2.4.31_MD5                        = c7d64e3caedb2f2b10e1c11db7f73a04
 netfilter-layer7-v2.6.tar.gz_MD5                       = 58135cd1aafaf4ae2fa478159206f064
 patch-2.6.16-nath323-1.3.bz2_MD5                       = f926409ff703a307baf54b57ab75d138

+squashfs3.0.tar.gz_MD5                         = 9fd05d0bfbb712f5fb95edafea5bc733

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 

diff --git a/src/patches/bash-3.1-login.patch b/src/patches/bash-3.1-login.patch
new file mode 100644 (file)
index 0000000..8e950ba
--- /dev/null
+++ b/src/patches/bash-3.1-login.patch
@@ -0,0 +1,15 @@
+--- bash-3.1/shell.c.login     2006-01-13 16:52:14.000000000 +0000
++++ bash-3.1/shell.c   2006-01-13 16:52:15.000000000 +0000
+@@ -1543,9 +1543,10 @@
+      any startup files; just try to be more like /bin/sh. */
+   shell_name = argv0 ? base_pathname (argv0) : PROGRAM;
+ 
+-  if (*shell_name == '-')
++  if (argv0 && *argv0 == '-')
+     {
+-      shell_name++;
++      if (*shell_name == '-')
++        shell_name++;
+       login_shell++;
+     }
+