Deleted Added
full compact
rc.subr (153297) rc.subr (155570)
1# $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $
1# $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $
2# $FreeBSD: head/etc/rc.subr 153297 2005-12-10 20:19:08Z dougb $
2# $FreeBSD: head/etc/rc.subr 155570 2006-02-12 12:57:07Z flz $
3#
4# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
5# All rights reserved.
6#
7# This code is derived from software contributed to The NetBSD Foundation
8# by Luke Mewburn.
9#
10# Redistribution and use in source and binary forms, with or without

--- 1313 unchanged lines hidden (view full) ---

1324# Creates a list of providers for GELI encryption.
1325geli_make_list()
1326{
1327 local devices devices2
1328 local provider mountpoint type options rest
1329
1330 # Create list of GELI providers from fstab.
1331 while read provider mountpoint type options rest ; do
3#
4# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
5# All rights reserved.
6#
7# This code is derived from software contributed to The NetBSD Foundation
8# by Luke Mewburn.
9#
10# Redistribution and use in source and binary forms, with or without

--- 1313 unchanged lines hidden (view full) ---

1324# Creates a list of providers for GELI encryption.
1325geli_make_list()
1326{
1327 local devices devices2
1328 local provider mountpoint type options rest
1329
1330 # Create list of GELI providers from fstab.
1331 while read provider mountpoint type options rest ; do
1332 case ":${options}" in
1333 :*noauto*)
1334 noauto=yes
1335 ;;
1336 *)
1337 noauto=no
1338 ;;
1339 esac
1340
1332 case ":${provider}" in
1333 :#*)
1334 continue
1335 ;;
1336 *.eli)
1337 # Skip swap devices.
1341 case ":${provider}" in
1342 :#*)
1343 continue
1344 ;;
1345 *.eli)
1346 # Skip swap devices.
1338 if [ "${type}" = "swap" -o "${options}" = "sw" ]; then
1347 if [ "${type}" = "swap" -o "${options}" = "sw" -o "${noauto}" = "yes" ]; then
1339 continue
1340 fi
1341 devices="${devices} ${provider}"
1342 ;;
1343 esac
1344 done < /etc/fstab
1345
1346 # Append providers from geli_devices.

--- 50 unchanged lines hidden ---
1348 continue
1349 fi
1350 devices="${devices} ${provider}"
1351 ;;
1352 esac
1353 done < /etc/fstab
1354
1355 # Append providers from geli_devices.

--- 50 unchanged lines hidden ---