]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'ms/install-raid' into install-raid
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 Oct 2014 13:03:45 +0000 (15:03 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 10 Oct 2014 13:03:45 +0000 (15:03 +0200)
Conflicts:
lfs/bash

1  2 
lfs/bash

diff --combined lfs/bash
index c75895124590524f412a2072cb08393487c93d2b,79dce52880edd3f5dd5dee9544f3fe3cabbd17c2..c215b5a32c71e2cabb1a0bf77656c4f18384de5a
+++ b/lfs/bash
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
- # Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+ # Copyright (C) 2007-2014   IPFire Team   <info@ipfire.org>                   #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@@ -87,7 -87,7 +87,7 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        sed -e "s/filename, RTLD_LAZY/filename, RTLD_NOW/" \
                -i $(DIR_APP)/builtins/enable.def
  
 -      for i in $$(seq 1 27); do \
 +      for i in $$(seq 1 30); do \
                cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash43-$$(printf "%03d" "$${i}") || exit 1; \
        done