--- elwix/build_fs.sh 2012/03/20 16:12:44 1.3.2.5 +++ elwix/build_fs.sh 2012/10/10 13:02:11 1.3.2.10 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_fs.sh,v 1.3.2.5 2012/03/20 16:12:44 misho Exp $ +# $Id: build_fs.sh,v 1.3.2.10 2012/10/10 13:02:11 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -54,24 +54,24 @@ build_fsdir() install -d altroot/var/at; install -d altroot/var/at/jobs; install -d altroot/var/at/spool; - install -d -g authpf -m 0770 altroot/var/authpf; + install -d -g 63 -m 0770 altroot/var/authpf; install -d -m 0750 altroot/var/cron; install -d -m 0700 altroot/var/cron/tabs; install -d altroot/var/db; install -d -m 0555 altroot/var/empty; install -d altroot/var/log; - install -d -o www -g www altroot/var/log/lighttpd; - install -d -o quagga -g quagga altroot/var/log/quagga; +# install -d -o 80 -g 80 altroot/var/log/lighttpd; + install -d -o 101 -g 101 altroot/var/log/quagga; install -d altroot/var/named; install -d altroot/var/run; - install -d -o www -g www altroot/var/run/lighttpd; - install -d -o bind -g bind altroot/var/run/named; - install -d -o quagga -g quagga altroot/var/run/quagga; +# install -d -o 80 -g 80 altroot/var/run/lighttpd; + install -d -o 53 -g 53 altroot/var/run/named; + install -d -o 101 -g 101 altroot/var/run/quagga; install -d altroot/var/spool; - install -d -o uucp -g dialer -m 0775 altroot/var/spool/lock; - install -d -g daemon altroot/var/spool/lpd; - install -d -g daemon altroot/var/spool/output; - install -d -g daemon altroot/var/spool/output/lpd; + install -d -o 66 -g 68 -m 0775 altroot/var/spool/lock; + install -d -g 1 altroot/var/spool/lpd; + install -d -g 1 altroot/var/spool/output; + install -d -g 1 altroot/var/spool/output/lpd; # boot install -d boot; # cf @@ -87,6 +87,7 @@ build_fsdir() # pkg install -d pkg; install -d pkg/db; + install -d pkg/lib; # tftpboot install -d tftpboot; @@ -184,7 +185,7 @@ mketc() chmod 0440 $1/etc/sudoers; - chgrp www $1/etc/config.xml; + chgrp 80 $1/etc/config.xml; chmod 0660 $1/etc/config.xml; ln -sf /etc/rc.s $1/etc/rc.S @@ -213,8 +214,9 @@ mkbackup() mkdir -p $1/altroot/backup cd $1 - tar -czf altroot/backup/.etc.tgz etc cp -p etc/config.xml altroot/backup + tar -czf altroot/backup/.etc.tgz etc + cd altroot tar -czf backup/.var.tgz var } @@ -239,9 +241,20 @@ install_fsdir() install -v ${REL}/${ROOTFS_KERN} ${FS}/boot/kernel - install -v ${REL}/${ROMFS_IMG} ${FS}/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} - ln ${FS}/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/altroot/${ROMFS_IMG} - ln -s /elwix/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/${ROMFS_IMG} + if [ "${BUILD_FRMIMG}" = "YES" ]; then + install -v ${REL}/${ROMFS_IMG} ${FS}/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} + ln ${FS}/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/altroot/${ROMFS_IMG} + ln -s /elwix/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/${ROMFS_IMG} + + install -v ${REL}/${ROMFS_IMG2} ${FS}/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} + ln ${FS}/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} ${FS}/altroot/${ROMFS_IMG2} + ln -s /elwix/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} ${FS}/${ROMFS_IMG2} + else + install -d ${FS}/usr + cd ${FS}/usr + pax -r -z -pe -f ${REL}/${ROMFS_IMG} + cd - + fi cd $FS tar -czvf ${REL}/${OS} .