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 ...@@ -12,8 +12,7 @@ cp /etc/rc /etc/rc.bak
cat > /etc/rc <<EOF cat > /etc/rc <<EOF
#!/bin/sh #!/bin/sh
# OPNsense rc(8) hook was automatically installed: # OPNsense rc(8) hook was automatically installed:
if [ -f /root/core/src/etc/rc ]; then /root/core/src/etc/rc; exit 0; if [ -f /usr/local/etc/rc ]; then /usr/local/etc/rc; exit 0; fi
elif [ -f /usr/local/etc/rc ]; then /usr/local/etc/rc; exit 0; fi
EOF EOF
cat /etc/rc.bak >> /etc/rc cat /etc/rc.bak >> /etc/rc
rm -f /etc/rc.bak rm -f /etc/rc.bak
......
...@@ -8,5 +8,5 @@ rm -f /etc/shells.bak ...@@ -8,5 +8,5 @@ rm -f /etc/shells.bak
echo "Unhooking from /etc/rc" echo "Unhooking from /etc/rc"
cp /etc/rc /etc/rc.bak 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 rm -f /etc/rc.bak
...@@ -61,11 +61,6 @@ else ...@@ -61,11 +61,6 @@ else
done done
fi fi
# mount repo if available
if [ -d /root/core ]; then
make -C /root/core mount
fi
# regenerate groups and users # regenerate groups and users
/usr/local/etc/rc.recover > /dev/null /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