| version 1.7.4.2, 2013/10/14 15:08:12 | version 1.10.2.8, 2017/06/28 08:58:51 | 
| Line 51  MakeFS_var() | Line 51  MakeFS_var() | 
 | cd $1 | cd $1 | 
 |  |  | 
 | install -d altroot; | install -d altroot; | 
 |  |  | 
 |  | install -d altroot/pkg; | 
 |  | install -d altroot/pkg/db; | 
 |  | install -d altroot/pkg/keys; | 
 |  | install -d altroot/pkg/keys/revoked; | 
 |  | install -d altroot/pkg/keys/trusted; | 
 |  |  | 
 | install -d altroot/var; | install -d altroot/var; | 
 | install -d altroot/var/account; | install -d altroot/var/account; | 
 | install -d altroot/var/at; | install -d altroot/var/at; | 
 | install -d altroot/var/at/jobs; | install -d altroot/var/at/jobs; | 
 | install -d altroot/var/at/spool; | install -d altroot/var/at/spool; | 
 | install -d -g 63 -m 0770 altroot/var/authpf; | install -d -g 63 -m 0770 altroot/var/authpf; | 
 |  | install -d altroot/var/backups; | 
 | install -d -m 0750 altroot/var/cron; | install -d -m 0750 altroot/var/cron; | 
 | install -d -m 0700 altroot/var/cron/tabs; | install -d -m 0700 altroot/var/cron/tabs; | 
 | install -d altroot/var/db; | install -d altroot/var/db; | 
 |  | install -d altroot/var/db/pkg; | 
 | install -d -m 0555 altroot/var/empty; | install -d -m 0555 altroot/var/empty; | 
 | install -d altroot/var/log; | install -d altroot/var/log; | 
 | install -d -o 80 -g 80 -m 0700 altroot/var/log/lighttpd; | install -d -o 80 -g 80 -m 0700 altroot/var/log/lighttpd; | 
 | install -d -o 101 -g 101 altroot/var/log/quagga; | install -d -o 101 -g 101 altroot/var/log/quagga; | 
 | install -d -o 883 -g 883 altroot/var/mqtt; | install -d -o 883 -g 883 altroot/var/mqtt; | 
 | install -d altroot/var/run; |  | 
 | install -d altroot/var/frm; | install -d altroot/var/frm; | 
 |  | install -d altroot/var/run; | 
 |  | install -d -o 80 -g 80 altroot/var/run/lighttpd; | 
 | install -d -o 101 -g 101 altroot/var/run/quagga; | install -d -o 101 -g 101 altroot/var/run/quagga; | 
 | install -d altroot/var/spool; | install -d altroot/var/spool; | 
 | install -d -o 66 -g 68 -m 0775 altroot/var/spool/lock; | install -d -o 66 -g 68 -m 0775 altroot/var/spool/lock; | 
 |  | install -d -o 80 -g 80 -m 0775 altroot/var/spool/lighttpd; | 
 |  | install -d -o 80 -g 80 altroot/var/spool/lighttpd/sockets; | 
 | install -d -g 1 altroot/var/spool/lpd; | install -d -g 1 altroot/var/spool/lpd; | 
 | install -d -g 1 altroot/var/spool/output; | install -d -g 1 altroot/var/spool/output; | 
 | install -d -g 1 altroot/var/spool/output/lpd; | install -d -g 1 altroot/var/spool/output/lpd; | 
 |  | install -d -o 59 -g 59 altroot/var/unbound; | 
 |  |  | 
 | ln -fs /tmp altroot/var/tmp; | ln -fs /tmp altroot/var/tmp; | 
 |  |  | 
| Line 98  MakeFS_var() | Line 111  MakeFS_var() | 
 | touch altroot/var/log/ppp.log | touch altroot/var/log/ppp.log | 
 | chgrp 69 altroot/var/log/ppp.log | chgrp 69 altroot/var/log/ppp.log | 
 |  |  | 
| install -v $2/resolv.safe altroot/var/run/resolv.conf | #        install -v $2/resolv.safe altroot/var/run/resolv.conf | 
|  | install -v ${WORLD}/usr/share/keys/pkg/trusted/* altroot/pkg/keys/trusted | 
 |  |  | 
 | chown -hR root:wheel . |  | 
 | cd - | cd - | 
 | } | } | 
 |  |  | 
| Line 113  MakeFS_etc() | Line 126  MakeFS_etc() | 
 |  |  | 
 | chown -R root:wheel $1/etc; | chown -R root:wheel $1/etc; | 
 |  |  | 
| chmod 0600 $1/etc/opieaccess; | case "$3" in | 
| chmod 0600 $1/etc/opiekeys; | uboot) | 
|  | ;; | 
|  | *) | 
|  | #                        chmod 0600 $1/etc/opieaccess; | 
|  | #                        chmod 0600 $1/etc/opiekeys; | 
|  | ;; | 
|  | esac | 
 |  |  | 
 | chmod 0600 $1/etc/master.passwd; | chmod 0600 $1/etc/master.passwd; | 
 | chmod 0600 $1/etc/spwd.db; | chmod 0600 $1/etc/spwd.db; | 
| Line 122  MakeFS_etc() | Line 141  MakeFS_etc() | 
 | chmod 0600 $1/etc/ssh/ssh_host_key; | chmod 0600 $1/etc/ssh/ssh_host_key; | 
 | chmod 0600 $1/etc/ssh/ssh_host_rsa_key; | chmod 0600 $1/etc/ssh/ssh_host_rsa_key; | 
 | chmod 0600 $1/etc/ssh/ssh_host_ecdsa_key; | chmod 0600 $1/etc/ssh/ssh_host_ecdsa_key; | 
 |  | chmod 0600 $1/etc/ssh/ssh_host_ed25519_key; | 
 |  |  | 
 | chmod 0440 $1/etc/sudoers; | chmod 0440 $1/etc/sudoers; | 
 |  |  | 
 | chgrp 80 $1/etc/config.xml; |  | 
 | chmod 0660 $1/etc/config.xml; |  | 
 |  |  | 
 | mkdir -p $1/etc/mqtt; | mkdir -p $1/etc/mqtt; | 
 | chgrp -R 883 $1/etc/mqtt; | chgrp -R 883 $1/etc/mqtt; | 
 | chown -R 883 $1/etc/mqtt; | chown -R 883 $1/etc/mqtt; | 
| Line 137  MakeFS_etc() | Line 154  MakeFS_etc() | 
 | ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime; | ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime; | 
 | ln -sf /usr/share/misc/termcap $1/etc/termcap; | ln -sf /usr/share/misc/termcap $1/etc/termcap; | 
 |  |  | 
| ln -sf /var/run/resolv.conf $1/etc/resolv.conf; | #        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; | echo ${TARGET_ARCH} >$1/etc/platform; | 
 |  |  | 
| Line 163  MakeFS_home() | Line 180  MakeFS_home() | 
 | install -v ${CFGDIR}/root.skel/vimrc $1/root/.vimrc; | install -v ${CFGDIR}/root.skel/vimrc $1/root/.vimrc; | 
 | } | } | 
 |  |  | 
 | # $1 = fs/elwix |  | 
 | MakeFS_backup() |  | 
 | { |  | 
 | mkdir -p $1/altroot/backup |  | 
 |  |  | 
 | cd $1 |  | 
 | cp -p etc/config.xml altroot/backup |  | 
 | tar -czf altroot/backup/.etc.tgz etc |  | 
 |  |  | 
 | cd altroot |  | 
 | tar -czf backup/.var.tgz var |  | 
 | } |  | 
 |  |  | 
 | # $1 = fs | # $1 = fs | 
 | MakeFS_boot() | MakeFS_boot() | 
 | { | { | 
| Line 183  MakeFS_boot() | Line 187  MakeFS_boot() | 
 |  |  | 
 | install -m 644 ${CFGDIR}/boot/boot.config $1; | install -m 644 ${CFGDIR}/boot/boot.config $1; | 
 |  |  | 
| install -m 444 ${CFGDIR}/boot/beastie.4th $1/boot; | case ${TARGET} in | 
| install -m 444 ${CFGDIR}/boot/brand.4th $1/boot; | i386|amd64) | 
| install -m 444 ${CFGDIR}/boot/menu.4th $1/boot; | install -m 444 ${CFGDIR}/boot/logo-elwix.4th $1/boot; | 
|  | install -m 444 ${CFGDIR}/boot/brand-elwix.4th $1/boot; | 
|  | install -m 444 ${CFGDIR}/boot/menu.4th $1/boot; | 
|  | ;; | 
|  | *) | 
|  | ;; | 
|  | esac | 
 |  |  | 
 | install -m 444 ${KERNDEVHINTS} $1/boot/device.hints; | install -m 444 ${KERNDEVHINTS} $1/boot/device.hints; | 
 |  |  | 
 | if [ -r ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf ]; then | if [ -r ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf ]; then | 
 | install -m 644 ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf $1/boot/loader.conf; | install -m 644 ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf $1/boot/loader.conf; | 
| else | install -m 644 ${CFGDIR}/boot/loader.conf.local $1/boot/loader.conf.local; | 
| echo; |  | 
| echo "Can't find right loader.conf for TARGET_ARCH=${TARGET_ARCH} ... loader.conf not installed!"; |  | 
| echo; |  | 
 | fi; | fi; | 
 | } | } | 
 |  |  | 
| Line 214  InstallList() | Line 221  InstallList() | 
 | for i in $(cat $TMPFILE); do | for i in $(cat $TMPFILE); do | 
 | if [ -x $i ]; then | if [ -x $i ]; then | 
 | echo "Strip '$i'" | echo "Strip '$i'" | 
| strip -s $i | ${CEXEC} chflags -f noschg $i | 
|  | ${CEXEC} strip -s $i | 
 | fi | fi | 
 | done | done | 
 | cd - | cd - | 
| Line 250  InstallFiles() | Line 258  InstallFiles() | 
 | fi | fi | 
 | } | } | 
 |  |  | 
 |  | # $1 = From dir | 
 |  | # $2 = To dir | 
 |  | InstallLibs() | 
 |  | { | 
 |  | ${CEXEC} find -X $2 ! -name "*.ko" -and -type f | \ | 
 |  | xargs readelf -d 2>&- | grep "NEEDED" | sort | uniq | \ | 
 |  | awk '($2 == "(NEEDED)") { print substr($5, 2, length($5) - 2); }' \ | 
 |  | 2>/dev/null >${DEST}/elwix_mklibs.tmp | 
 |  | for i in $(cat ${DEST}/elwix_mklibs.tmp); do | 
 |  | echo $i | 
 |  | ${CEXEC} find $1 -type f -name $i -exec install -v {} $LIBS \\\; | 
 |  | ${CEXEC} chflags -f noschg $LIBS/$i | 
 |  | ${CEXEC} strip -s $LIBS/$i | 
 |  | done | 
 |  | #       ${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 | # $1 = Directory for clean | 
 | CleanCVS() | CleanCVS() | 
 | { | { | 
| Line 273  StripFiles() | Line 301  StripFiles() | 
 | for i in $(cat $TMPFILE); do | for i in $(cat $TMPFILE); do | 
 | if [ -x $i ]; then | if [ -x $i ]; then | 
 | echo "Strip '$i'" | echo "Strip '$i'" | 
| strip -s $i | ${CEXEC} chflags -f noschg $i | 
|  | ${CEXEC} strip -s $i | 
 | fi | fi | 
 | done | done | 
 | cd - | cd - |