Commit 78eeee94 authored by Franco Fichtner's avatar Franco Fichtner

rc/pkg: remove the automount features, they are not needed anymore

The new package targets have no drawbacks compared to auto live
mount, but the latter has proven difficult and does not match the
normal boot scenario and could potentially panic due to unionfs
being broken beyond repair (kib@'s words in spirit, not mine).

Discussed with: @adschellevis

(cherry picked from commit 80a70ffe)
parent 2ee9b06e
......@@ -12,8 +12,7 @@ cp /etc/rc /etc/rc.bak
cat > /etc/rc <<EOF
#!/bin/sh
# OPNsense rc(8) hook was automatically installed:
if [ -f /root/core/src/etc/rc ]; then /root/core/src/etc/rc; exit 0;
elif [ -f /usr/local/etc/rc ]; then /usr/local/etc/rc; exit 0; fi
if [ -f /usr/local/etc/rc ]; then /usr/local/etc/rc; exit 0; fi
EOF
cat /etc/rc.bak >> /etc/rc
rm -f /etc/rc.bak
......
......@@ -8,5 +8,5 @@ rm -f /etc/shells.bak
echo "Unhooking from /etc/rc"
cp /etc/rc /etc/rc.bak
tail -n +5 /etc/rc.bak > /etc/rc
tail -n +4 /etc/rc.bak > /etc/rc
rm -f /etc/rc.bak
......@@ -61,11 +61,6 @@ 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment