Calamaris-Proxy-Logdatei-Analyzer eingebaut.

[people/pmueller/ipfire-2.x.git] / lfs / stage2

diff --git a/lfs/stage2 b/lfs/stage2
index 178cda57ae791b9d511136baecd5b3cf94bfbb6f..3643e7a8d7cd9a365f9baf4ce1861068d01356b7 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: stage2,v 1.14.2.5 2006/02/08 23:53:37 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,6 +26,8 @@
 
 include Config
 
+VER        = ipfire
+
 THISAPP    = stage2
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -55,38 +51,39 @@ $(TARGET) :
        @$(PREBUILD)
 
        # Create directories
-       -mkdir -p /{bin,boot,dev/{pts,shm,net},etc/opt,home,lib,mnt,proc} 
-       -mkdir -p /{root,sbin,tmp,usr/local,var,opt}
-       -for dirname in /usr /usr/local; do \
-           mkdir $$dirname/{bin,etc,include,lib,sbin,share,src}; \
-           ln -sf share/{man,doc,info} $$dirname; \
-           mkdir $$dirname/share/{dict,doc,info,locale,man}; \
-           mkdir $$dirname/share/{nls,misc,terminfo,zoneinfo}; \
-           mkdir $$dirname/share/man/man{1,2,3,4,5,6,7,8}; \
-       done
-       -mkdir -p /var/{lock/subsys,log,mail,run,spool}
-       -mkdir -p /var/{tmp,opt,cache,lib/misc,local,empty}
-       -mkdir /opt/{bin,doc,include,info}
-       -mkdir -p /opt/{lib,man/man{1,2,3,4,5,6,7,8}}
-
-       # Permissions
-       chmod 0750 /root
-       chmod 1777 /tmp /var/tmp
-       chmod 0711 /var/empty
+       -mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib,mnt,opt}
+       -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
+       -install -dv -m 0750 /root
+       -install -dv -m 1777 /tmp /var/tmp
+       -mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
+       -mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
+       -mkdir -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
+       -mkdir -pv /usr/{,local/}share/man/man{1..8}
+       #-for dir in /usr /usr/local; do \
+       #  ln -sv share/{man,doc,info} $$dir; \
+       #done
        
        # Symlinks
        # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
-       -ln -sf /tools/bin/{bash,cat,pwd,stty} /bin
-       -ln -sf /tools/bin/perl /usr/bin
-       -ln -sf /tools/lib/libgcc_s.so.1 /usr/lib
-       -ln -sf bash /bin/sh
+       -ln -sv /tools/bin/{bash,cat,grep,pwd,stty} /bin
+       -ln -sv /tools/bin/perl /usr/bin
+       -ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
+       -ln -sv bash /bin/sh
 
        # Config files
        for i in $(DIR_SRC)/config/etc/*; do \
            [ -f $$i ] && cp $$i /etc; \
        done
-       ln -sf /proc/mounts /etc/mtab
-       echo "$(NAME) v$(VERSION) - $(SLOGAN)" > /etc/issue
+       touch /etc/mtab
+       echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
+       echo "===============================" >> /etc/issue
+       echo "\n running on \s \r \m"          >> /etc/issue
+
+       # Bash startup files
+       install --directory --mode=0755 --owner=root --group=root /etc/profile.d
+       for i in $(DIR_SRC)/config/profile.d/*; do \
+           [ -f $$i ] && cp $$i /etc/profile.d; \
+       done
 
        # Scripts
        for i in `find $(DIR_SRC)/src/scripts -maxdepth 1 -type f`; do \
@@ -98,8 +95,16 @@ $(TARGET) :
        -mkdir -p /home/nobody
        chown -R nobody:nobody /home/nobody
 
-       # Patches directory
-       -mkdir -m 1775 -p /var/patches
-       chown -R root:nobody /var/patches
+       # Create /var dirs and files
+       -mkdir -v /var/{lock,log,mail,run,spool,empty}
+       -mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
+       -mkdir -pv /var/log/{counter,calamaris}
+       chown nobody.nobody /var/log/calamaris
+       touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
+       chgrp -v utmp /var/run/utmp /var/log/lastlog
+       chmod -v 664 /var/run/utmp /var/log/lastlog
+
+       # Permissions
+       chmod 0711 /var/empty
 
        @$(POSTBUILD)