--- elwix/config/rc.subr 2013/10/14 15:19:37 1.7.4.3 +++ elwix/config/rc.subr 2014/01/21 16:33:40 1.8.2.3 @@ -4,7 +4,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: rc.subr,v 1.7.4.3 2013/10/14 15:19:37 misho Exp $ +# $Id: rc.subr,v 1.8.2.3 2014/01/21 16:33:40 misho Exp $ # ### Dont edit this file !!! @@ -76,6 +76,7 @@ MakeFS_var() 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; + install -d -o 59 -g 59 altroot/var/unbound; ln -fs /tmp altroot/var/tmp; @@ -103,7 +104,6 @@ MakeFS_var() install -v $2/resolv.safe altroot/var/run/resolv.conf - chown -hR root:wheel . cd - } @@ -116,8 +116,14 @@ MakeFS_etc() chown -R root:wheel $1/etc; - chmod 0600 $1/etc/opieaccess; - chmod 0600 $1/etc/opiekeys; + case "$3" in + uboot) + ;; + *) + chmod 0600 $1/etc/opieaccess; + chmod 0600 $1/etc/opiekeys; + ;; + esac chmod 0600 $1/etc/master.passwd; chmod 0600 $1/etc/spwd.db; @@ -142,7 +148,7 @@ MakeFS_etc() ln -sf /var/run/resolv.conf $1/etc/resolv.conf; - ln -sf /elwix/pkg/etc/mk.conf $1/etc/mk.conf; +# ln -sf /elwix/pkg/etc/mk.conf $1/etc/mk.conf; echo ${TARGET_ARCH} >$1/etc/platform; @@ -186,18 +192,20 @@ MakeFS_boot() install -m 644 ${CFGDIR}/boot/boot.config $1; - install -m 444 ${CFGDIR}/boot/beastie.4th $1/boot; - install -m 444 ${CFGDIR}/boot/brand.4th $1/boot; - install -m 444 ${CFGDIR}/boot/menu.4th $1/boot; + case ${TARGET} in + i386) + install -m 444 ${CFGDIR}/boot/beastie.4th $1/boot; + install -m 444 ${CFGDIR}/boot/brand.4th $1/boot; + install -m 444 ${CFGDIR}/boot/menu.4th $1/boot; + ;; + *) + ;; + esac install -m 444 ${KERNDEVHINTS} $1/boot/device.hints; if [ -r ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf ]; then install -m 644 ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf $1/boot/loader.conf; - else - echo; - echo "Can't find right loader.conf for TARGET_ARCH=${TARGET_ARCH} ... loader.conf not installed!"; - echo; fi; } @@ -251,6 +259,16 @@ InstallFiles() tar -cvf - -T - | tar -C $3 -xf - cd - fi +} + +# $1 = From dir +# $2 = To dir +InstallLibs() +{ + ${CEXEC} find -X $2 ! -name "*.ko" -and -type f -and -perm +111 | \ + xargs ldd -f "%p\n" 2> /dev/null | sort | uniq | \ + sed 's|^/||' >${DEST}/elwix_mklibs.conf + InstallList ${DEST}/elwix_mklibs.conf $1 $2 } # $1 = Directory for clean