--- elwix/config/rc.subr 2013/08/05 11:45:50 1.6.2.6
+++ elwix/config/rc.subr 2021/07/16 18:35:50 1.12
@@ -4,11 +4,16 @@
# (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
# by Michael Pounov <misho@elwix.org>
#
-# $Id: rc.subr,v 1.6.2.6 2013/08/05 11:45:50 misho Exp $
+# $Id: rc.subr,v 1.12 2021/07/16 18:35:50 misho Exp $
#
### Dont edit this file !!!
+Die() {
+ echo -n "EXIT: " >&2; echo "$@" >&2
+ exit 1
+}
+
CheckVer()
{
[ -z "$1" -o ! -r "$1" ] && return 1
@@ -51,29 +56,41 @@ MakeFS_var()
cd $1
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/account;
install -d altroot/var/at;
install -d altroot/var/at/jobs;
install -d altroot/var/at/spool;
install -d -g 63 -m 0770 altroot/var/authpf;
+ install -d altroot/var/backups;
install -d -m 0750 altroot/var/cron;
install -d -m 0700 altroot/var/cron/tabs;
install -d altroot/var/db;
+ install -d altroot/var/db/pkg;
install -d -m 0555 altroot/var/empty;
install -d altroot/var/log;
+ 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 883 -g 883 altroot/var/mqtt;
- install -d altroot/var/named;
- install -d altroot/var/run;
install -d altroot/var/frm;
- install -d -o 53 -g 53 altroot/var/run/named;
+ 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 altroot/var/spool;
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/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;
@@ -99,11 +116,9 @@ MakeFS_var()
touch altroot/var/log/ppp.log
chgrp 69 altroot/var/log/ppp.log
- InstallDir ${WORLD}/var/named $1/altroot/var/named
- InstallList ${ELWIX_BSDSRC} ${BSDSRC} $1/altroot/var/named
- 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 -
}
@@ -116,8 +131,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;
@@ -125,12 +146,10 @@ MakeFS_etc()
chmod 0600 $1/etc/ssh/ssh_host_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_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;
chgrp -R 883 $1/etc/mqtt;
chown -R 883 $1/etc/mqtt;
@@ -140,12 +159,11 @@ MakeFS_etc()
ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime;
ln -sf /usr/share/misc/termcap $1/etc/termcap;
- ln -sf /var/named/etc/namedb $1/etc/namedb;
- 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} $3" >$1/etc/platform;
Create_etc_motd $1/etc/motd $3;
@@ -167,19 +185,6 @@ MakeFS_home()
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
MakeFS_boot()
{
@@ -187,18 +192,23 @@ 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|amd64)
+ 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;
+ install -m 444 ${CFGDIR}/boot/logo-elwix.lua $1/boot/lua;
+ install -m 444 ${CFGDIR}/boot/brand-elwix.lua $1/boot/lua;
+ ;;
+ *)
+ ;;
+ 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;
+ install -m 644 ${CFGDIR}/boot/loader.conf.local $1/boot/loader.conf.local;
fi;
}
@@ -216,9 +226,15 @@ InstallList()
sed -nE -e 's/^ *([^ #]+) */\1/p' < $1 | tr ':' '\n' >$TMPFILE
cd $2
for i in $(cat $TMPFILE); do
+ if [ ! -f $i ]; then
+ rm -f $TMPFILE
+ echo "Error:: File not found $i"
+ exit 1
+ fi
if [ -x $i ]; then
echo "Strip '$i'"
- strip -s $i
+ ${CEXEC} chflags -f noschg $i
+ ${CEXEC} strip -s $i
fi
done
cd -
@@ -254,6 +270,26 @@ InstallFiles()
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
CleanCVS()
{
@@ -277,10 +313,24 @@ StripFiles()
for i in $(cat $TMPFILE); do
if [ -x $i ]; then
echo "Strip '$i'"
- strip -s $i
+ ${CEXEC} chflags -f noschg $i
+ ${CEXEC} strip -s $i
fi
done
cd -
rm -f $TMPFILE
+ fi
+}
+
+# $1 = file_pattern
+# $2 = From dir
+# $3 = To dir
+InstallLinks()
+{
+ if [ -d "$2" ]; then
+ cd $2
+ find . -type l -name "$1" |
+ tar -cvf - -T - | tar -C $3 -xf -
+ cd -
fi
}