--- elwix/build_fs.sh 2012/10/10 14:13:16 1.3.2.11 +++ elwix/build_fs.sh 2013/07/31 14:57:01 1.7.2.7 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_fs.sh,v 1.3.2.11 2012/10/10 14:13:16 misho Exp $ +# $Id: build_fs.sh,v 1.7.2.7 2013/07/31 14:57:01 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -30,22 +30,25 @@ if [ "${USER}" != "root" ]; then exit 1 fi -clean_fsdir() +clean_rel() { - echo "+++ Clean ELWIX FS ..." - rm -rf ${FS} + echo "+++ Clean ELWIX OS release ..." + rm -rf $1 $2 - echo "+++ Clean ELWIX FS release ..." - rm -rf ${REL}/${OS} + mkdir -p $1 + + if [ -d ${BASEFS} ]; then + cd ${BASEFS} + pax -rw -pe -X . $1 + cd - + fi } -build_fsdir() +build_vardir() { - echo "+++ Build ELWIX FS directory ..." - mkdir -p ${FS} + echo "+++ Build ELWIX altroot directory ..." - cd ${FS} - + cd $1 # altroot install -d altroot; # altroot/var @@ -60,11 +63,11 @@ build_fsdir() install -d altroot/var/db; install -d -m 0555 altroot/var/empty; install -d altroot/var/log; -# install -d -o 80 -g 80 altroot/var/log/lighttpd; install -d -o 101 -g 101 altroot/var/log/quagga; + install -d -o 883 -g 883 altroot/var/mqtt; install -d altroot/var/named; install -d altroot/var/run; -# install -d -o 80 -g 80 altroot/var/run/lighttpd; + install -d altroot/var/sys; 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; @@ -72,32 +75,16 @@ build_fsdir() 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 - install -d cf; -# etc - install -d etc; -# exports - install -d exports; -# home - install -d home; -# root - install -d -m 0700 root; -# pkg - install -d pkg; - install -d pkg/db; - install -d pkg/lib; -# tftpboot - install -d tftpboot; + ln -fs /tmp altroot/var/tmp; + chown -hR root:wheel . cd - } mkboot() { - echo "+++ Build ELWIX FS boot directory ..." + echo "+++ Build ELWIX OS boot directory ..." InstallDir ${WORLD}/boot $1/boot install -m 644 ${CFGDIR}/boot/boot.config $1; @@ -119,20 +106,21 @@ mkboot() mkvar() { - echo "+++ Build ELWIX FS var directory ..." - ln -s /tmp $1/altroot/var/tmp + echo "+++ Build ELWIX OS var directory ..." + touch $1/altroot/var/run/utmp + touch $1/altroot/var/account/acct + touch $1/altroot/var/log/elwix touch $1/altroot/var/log/lastlog touch $1/altroot/var/log/wifi.log - touch $1/altroot/var/log/wtmp - touch $1/altroot/var/run/utmp - touch $1/altroot/var/account/acct + touch $1/altroot/var/log/utx.log touch $1/altroot/var/log/auth.log touch $1/altroot/var/log/cron touch $1/altroot/var/log/console.log touch $1/altroot/var/log/debug.log + touch $1/altroot/var/log/init.log touch $1/altroot/var/log/lpd-errs touch $1/altroot/var/log/maillog touch $1/altroot/var/log/messages @@ -148,7 +136,7 @@ mkvar() create_etc_motd() { - ELWIX_VER="ELWIX-${VERSION}_${TARGET_ARCH}"; + ELWIX_VER="ELWIX$2-${VERSION}_${TARGET_ARCH}"; ELWIX_HDR_MOTD="${ELWIX_VER} :: Build date ${BUILD_DATE}"; awk -v fo="${1:-motd}" 'BEGIN { print "'"${ELWIX_HDR_MOTD}"'" > fo; } { print $0 >> fo; }' \ @@ -158,17 +146,17 @@ create_etc_motd() create_etc_fstab() { cat >$1 <<_EOF -# Automatic generated fstab for ELWIX at ${BUILD_DATE} +# Automatic generated fstab for ELWIX$2 at ${BUILD_DATE} # -/dev/ufs/elwix /elwix ufs ro 0 1 -md4 /tmp mfs rw,-s8m,-oasync,-S 0 0 -md5 /var mfs rw,-s16m,-S 0 0 +/dev/ufs/elwix / ufs ro 0 1 +md2 /tmp mfs rw,-s8m,-oasync,-S 0 0 +md3 /var mfs rw,-s16m,-S 0 0 _EOF } mketc() { - echo "+++ Build ELWIX FS etc directory ..." + echo "+++ Build ELWIX OS etc directory ..." InstallDir ${FS_ETC} $1/etc chown -R root:wheel $1/etc; @@ -188,6 +176,10 @@ mketc() chgrp 80 $1/etc/config.xml; chmod 0660 $1/etc/config.xml; + mkdir -p $1/etc/mqtt; + chgrp -R 883 $1/etc/mqtt; + chown -R 883 $1/etc/mqtt; + ln -sf /etc/rc.s $1/etc/rc.S ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime; @@ -200,17 +192,17 @@ mketc() echo ${TARGET_ARCH} >$1/etc/platform; - create_etc_motd $1/etc/motd; - create_etc_fstab $1/etc/fstab; + create_etc_motd $1/etc/motd $2; + create_etc_fstab $1/etc/fstab $2; echo "+++ ELWIX clean CVS tags ..." - CleanCVS ${FS} - CleanCVS ${FS}/etc + CleanCVS $1 + CleanCVS $1/etc } mkbackup() { - echo "+++ Build ELWIX FS backup factory default directory ..." + echo "+++ Build ELWIX OS backup factory default directory ..." mkdir -p $1/altroot/backup cd $1 @@ -223,7 +215,7 @@ mkbackup() mkhome() { - echo "+++ Build ELWIX FS root home directory ..." + echo "+++ Build ELWIX OS root home directory ..." install -d $1/root/.ssh [ -r ${CFGDIR}/root.skel/ssh/authorized_keys2 ] && \ install -v ${CFGDIR}/root.skel/ssh/authorized_keys2 $1/root/.ssh; @@ -235,51 +227,35 @@ mkhome() install -v ${CFGDIR}/root.skel/vimrc $1/root/.vimrc; } -install_fsdir() +install_rel() { - echo "+++ Install ELWIX FS in bundle OS install file ..." + echo "+++ Install ELWIX OS $1 in bundle OS install file ..." + OSZ="" - install -v ${REL}/${ROOTFS_KERN} ${FS}/boot/kernel + install -v ${KERNEL} $1/boot/kernel; + cd $1/boot/kernel; + gzip -9 kernel; + cd -; - 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} + case "$2" in + *) + OSZ=${REL}/${OS} + ;; + esac - 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} . + cd $1 + tar -czvf $OSZ . } ### main() -if [ ! -r ${REL}/${ROOTFS_KERN} -o ! -r ${REL}/${ROMFS_IMG} ]; then - echo - echo "Error:: not found kernel or firmware elwix files ..." - echo - echo " For fix this issue, please re-run build_rootfs.sh or build_romfs.sh" - echo - exit 1 -fi - -clean_fsdir -build_fsdir - +clean_rel ${FS} ${REL}/${OS} +build_vardir ${FS}/elwix +mkhome ${FS}/elwix +mkvar ${FS}/elwix +mketc ${FS}/elwix +mkbackup ${FS}/elwix mkboot ${FS} -mkhome ${FS} -mkvar ${FS} -mketc ${FS} -mkbackup ${FS} +install_rel ${FS} -install_fsdir - -echo "+++ Complete build ELWIX FS" +echo "+++ Complete build ELWIX OS" echo "ELWIX finish version ${VERSION}, Good luck!"