Calamaris-Proxy-Logdatei-Analyzer eingebaut.

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

diff --git a/lfs/stage2 b/lfs/stage2
index 1fa8dcb8b7ae725df1613c5cfcc78909ddb58b38..3643e7a8d7cd9a365f9baf4ce1861068d01356b7 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -51,20 +51,17 @@ $(TARGET) :
        @$(PREBUILD)
 
        # Create directories
-       -mkdir -pv /{bin,boot,etc/opt,home,lib,mnt,opt}
-       -mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
+       -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
-
-       # Permissions
-       chmod 0711 /var/empty
+       #-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
@@ -78,7 +75,15 @@ $(TARGET) :
            [ -f $$i ] && cp $$i /etc; \
        done
        touch /etc/mtab
-       echo "$(NAME) v$(VERSION) - $(SLOGAN)" > /etc/issue
+       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 \
@@ -93,8 +98,13 @@ $(TARGET) :
        # 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)