rc: hook up recover script on bootup

Must move the git mount up to test this properly.
This commit is contained in:
Franco Fichtner 2015-06-30 01:19:48 +02:00
parent f4ddcaee44
commit cc7180222d
2 changed files with 8 additions and 13 deletions

View File

@ -652,10 +652,6 @@ function reload_all_sync() {
/* start the NTP client */
system_ntp_configure();
/* sync pw database */
@unlink('/etc/spwd.db.tmp');
mwexec('/usr/sbin/pwd_mkdb -d /etc/ /etc/master.passwd');
/* restart sshd */
mwexec_bg('/usr/local/etc/rc.sshd');

View File

@ -61,6 +61,14 @@ else
done
fi
# mount repo if available
if [ -d /root/core ]; then
make -C /root/core mount
fi
# regenerate groups and users
/usr/local/etc/rc.recover > /dev/null
# rewrite message of the day
/etc/rc.d/motd onestart
@ -85,11 +93,6 @@ if [ -d "/cf/conf" ]; then
fi
# !!! migration code for OPNsense <= 15.1.7, do not remove !!!
# mount repo if available
if [ -d /root/core ]; then
make -C /root/core mount
fi
# set up config directory structure
mkdir -p /conf/backup
mkdir -p /conf/sshd
@ -130,10 +133,6 @@ if [ "$CDDEVICE" != "" ]; then
cdcontrol -f /dev/"$CDDEVICE" eject
fi
# sync pw database after mount.
rm -f /etc/spwd.db.tmp
/usr/sbin/pwd_mkdb -d /etc/ /etc/master.passwd
# Enable console output if its muted.
/sbin/conscontrol mute off >/dev/null