--- elwix/build_fs.sh 2011/11/02 09:51:32 1.3 +++ elwix/build_fs.sh 2011/11/02 10:13:21 1.3.2.1 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_fs.sh,v 1.3 2011/11/02 09:51:32 misho Exp $ +# $Id: build_fs.sh,v 1.3.2.1 2011/11/02 10:13:21 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -167,12 +167,8 @@ _EOF mketc() { echo "+++ Build ELWIX FS etc directory ..." - find ${FS_ETC} -name .#\* -exec rm -f {} \; - InstallDir ${FS_ETC} $1/etc - find $1/etc -name CVS -exec rm -rf {} \; - chown -R root:wheel $1/etc; chmod 0600 $1/etc/opieaccess; @@ -236,8 +232,8 @@ install_fsdir() install -v ${REL}/${ROOTFS_KERN} ${FS}/boot/kernel - install -v ${REL}/${ROMFS_IMG} ${FS}/elwix-firmware-${VERSION}_${TARGET_ARCH} - ln -s /elwix/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/${ROMFS_IMG} + install -v ${REL}/${ROMFS_IMG} ${FS}/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} + ln -s /elwix/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/${ROMFS_IMG} cd $FS tar -czvf ${REL}/${OS} . @@ -248,6 +244,7 @@ cleancvs() echo "+++ ELWIX clean CVS tags ..." find $1 -type d -name CVS -exec rm -rf {} \; >/dev/null 2>&1 + find $1 -type f -name .#\* -exec rm -f {} \; >/dev/null 2>&1 } ### main() @@ -268,6 +265,7 @@ mkhome ${FS} mkvar ${FS} mketc ${FS} cleancvs ${FS} +cleancvs ${FS}/etc mkbackup ${FS} install_fsdir