# Authors: grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change: Son Apr 22 14:01:33 CEST 2007 [mika]
+# Latest change: Son Jul 01 20:34:14 CEST 2007 [mika]
################################################################################
# {{{ path, variables, signals, umask, zsh
if grep -q $p /proc/swaps ; then
ewarn "Not using swap partition ${WHITE}${p}${NORMAL} as it is already in use." ; eend 0
else
+ if [ -b "$p" ] ; then
einfo "Using swap partition ${WHITE}${p}${NORMAL}."
swapon $p 2>>$DEBUG ; eend $?
+ else
+ ewarn "$p is not a valid block device - not using it therefore." ; eend 0
+ fi
fi
;;
esac # dd-check
# use a swapfile
if [ -z "$NOSWAP" ] ; then
- mount -o "$MOUNTOPTS" -t $f $p $m 2>>$DEBUG || continue
+ mount -o "$MOUNTOPTS" -t $f $p $m 2>>$DEBUG && MOUNTED=1 || continue
# Activate swapfile, if exists
SWAPFILE="$(/bin/ls -1d $m/[Gg][Rr][Mm][Ll].[Ss][Ww][Pp] 2>/dev/null)"
fi
if [ -z "$NOSWAP" -a -n "$SWAPFILE" -a -f "$SWAPFILE" ]; then
mount -o remount,rw $m && MOUNTED=1
if swapon "$SWAPFILE" 2>>$DEBUG ; then
- einfo "Using GRML swapfile ${SWAPFILE}."
+ eindent
+ einfo "Using GRML swapfile ${WHITE}${SWAPFILE}${NORMAL}."
+ eoutdent
fnew="$SWAPFILE swap swap defaults 0 0"
stringinfile "$fnew" "/etc/fstab" || echo "$fnew" >> /etc/fstab
GRML_SWP="$GRML_SWP $SWAPFILE"
}
# }}}
+# {{{ LVM (Logical Volumes)
+config_lvm(){
+ if [ -z "$INSTALLED" ] ; then
+ # notice: checkbootparam "forensic" is just for users who don't know how to really use the bootoption
+ if checkbootparam 'nolvm' ; then
+ ewarn "Skipping LVM code as requested on boot commandline." ; eend 0
+ else
+ if ! [ -x /sbin/lvm -a -x /etc/init.d/lvm2 -a -x /sbin/lvdisplay ] ; then
+ eerror "LVM not available, can not execute it." ; eend 1
+ else
+ if lvdisplay 1>/dev/null 2>&1 ; then
+ einfo "You seem to have logical volumes (LVM) on your system."
+ eindent
+ einfo "Just run 'Start lvm2' to activate them or boot using 'lvm' as bootoption for autostart."
+ eend 0
+ if checkbootparam 'lvm' ; then
+ einfo "Bootoption LVM found. Searching for logical volumes:"
+ /etc/init.d/lvm2 start ; eend $?
+ fi
+ eoutdent
+ fi
+ fi # check for lvm binary
+ fi # check for bootoption nolvm
+ fi # run only in live-cd mode
+}
+# }}}
+
# {{{ debnet: setup network based on an existing one found on a partition
config_debnet(){
if checkbootparam "debnet" ; then