Skip to content

Commit

Permalink
rc/pkg: remove the automount features, they are not needed anymore
Browse files Browse the repository at this point in the history
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
  • Loading branch information
fichtner committed Mar 12, 2016
1 parent 8369db5 commit 80a70ff
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
3 changes: 1 addition & 2 deletions +POST_INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion +PRE_DEINSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions src/etc/rc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 80a70ff

Please sign in to comment.