Revision db6e63dd
Added by Christian McDonald about 3 years ago
| src/etc/pfSense-rc | ||
|---|---|---|
| 144 | 144 |
/sbin/reboot |
| 145 | 145 |
fi |
| 146 | 146 |
|
| 147 |
# Bring in RAM disk functions |
|
| 148 |
. /etc/rc.ramdisk_functions.sh |
|
| 149 |
|
|
| 150 | 147 |
# Handle ZFS read-only case |
| 151 | 148 |
unset USE_ZFS |
| 152 | 149 |
if /sbin/kldstat -qm zfs; then |
| ... | ... | |
| 165 | 162 |
if [ -d /bootpool ]; then |
| 166 | 163 |
/sbin/zpool import -f bootpool |
| 167 | 164 |
fi |
| 168 |
_be_mount_zfs # /etc/rc.d/zfsbe onestart |
|
| 165 |
# We need to handle ZFS boot environments here |
|
| 166 |
echo "Enabling ZFS boot environment..." |
|
| 167 |
/etc/rc.d/zfsbe onestart |
|
| 169 | 168 |
fi |
| 170 | 169 |
fi |
| 171 | 170 |
|
| ... | ... | |
| 182 | 181 |
# Sanity check the clock |
| 183 | 182 |
/etc/rc.checkclock |
| 184 | 183 |
|
| 184 |
. /etc/rc.ramdisk_functions.sh |
|
| 185 |
|
|
| 185 | 186 |
# Check if RAM disks are enabled, store for repeated use |
| 186 | 187 |
if ramdisk_check_enabled; then |
| 187 | 188 |
USE_RAMDISK=true |
| 188 | 189 |
fi |
| 189 | 190 |
|
| 190 |
# Relocate pkgdb on UFS based on desired RAM disk settings |
|
| 191 |
if [ -z "${USE_ZFS}" ]; then
|
|
| 192 |
ramdisk_relocate_pkgdb_all |
|
| 193 |
fi |
|
| 191 |
# Relocate pkgdb based on desired RAM disk settings |
|
| 192 |
ramdisk_relocate_pkgdb_all |
|
| 194 | 193 |
|
| 195 | 194 |
# Dismount /tmp and /var on ZFS if using RAM disks and they are separate volumes |
| 196 | 195 |
if [ -n "${USE_ZFS}" -a -n "${USE_RAMDISK}" ]; then
|
| 197 |
ramdisk_fixup_zfs_unmount
|
|
| 196 |
ramdisk_fixup_zfs umount
|
|
| 198 | 197 |
fi |
| 199 | 198 |
|
| 200 | 199 |
# Attempt to create and mount RAM disks |
| ... | ... | |
| 202 | 201 |
/etc/rc.embedded |
| 203 | 202 |
fi |
| 204 | 203 |
|
| 205 |
# If RAM disks are active, make symlinks for pkg database on UFS
|
|
| 204 |
# If RAM disks are active, make symlinks for pkg database |
|
| 206 | 205 |
if [ -n "${USE_RAMDISK}" -o -n "${MOVE_PKG_DATA}" ]; then
|
| 207 |
if [ -z "${USE_ZFS}" ]; then
|
|
| 208 |
ramdisk_link_pkgdb |
|
| 209 |
fi |
|
| 206 |
ramdisk_link_pkgdb |
|
| 210 | 207 |
fi |
| 211 | 208 |
|
| 212 | 209 |
# If activating RAM disks failed, then undo some of the above actions |
| 213 | 210 |
if [ -n "${USE_RAMDISK}" ] && ramdisk_failed; then
|
| 214 |
ramdisk_fixup_zfs_mount |
|
| 215 |
if [ -z "${USE_ZFS}" ]; then
|
|
| 216 |
ramdisk_relocate_pkgdb disk |
|
| 217 |
fi |
|
| 211 |
ramdisk_fixup_zfs mount |
|
| 212 |
ramdisk_relocate_pkgdb disk |
|
| 218 | 213 |
else |
| 219 | 214 |
ramdisk_reset_status |
| 220 | 215 |
fi |
Also available in: Unified diff
Revert "Fix RAM disk support for ZFS layout changes related to BEs. Fixes #13182"
This reverts commit b9097e4cfe3fcbdec86a00a5a470d93d05ea8102