Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen-geoip

Conflicts:
	make.sh
This commit is contained in:
Stefan Schantl
2015-02-14 12:34:31 +01:00
173 changed files with 66176 additions and 3094 deletions

View File

@@ -49,7 +49,7 @@ $(TARGET) :
@$(PREBUILD)
# Create directories
-mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib,mnt,opt,run}
-mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib/firmware/brcm,mnt,opt,run}
-mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
-install -dv -m 0750 /root
-install -dv -m 1777 /tmp /var/tmp
@@ -75,6 +75,7 @@ $(TARGET) :
# Config files
cp -rvf $(DIR_SRC)/config/etc/* /etc;
cp -rvf $(DIR_SRC)/config/lib/* /lib;
touch /etc/{fs,m}tab
echo "$(NAME) v$(VERSION) - $(SLOGAN)" > /etc/issue
echo "===============================" >> /etc/issue