# 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: Sam Feb 17 13:59:43 CET 2007 [mika]
+# Latest change: Mon Feb 19 18:59:09 CET 2007 [mika]
################################################################################
# {{{ path, variables, signals, umask, zsh
*) continue ;;
# *) NONEFOUND='1'; continue ;;
esac
- mount -o "$MOUNTOPTS" -t $f $p $m 2>>$DEBUG || continue
- # Activate swapfile, if exists
- SWAPFILE="$(/bin/ls -1d $m/[Gg][Rr][Mm][Ll].[Ss][Ww][Pp] 2>/dev/null)"
+ if [ -z "$NOSWAP" ] ; then
+ mount -o "$MOUNTOPTS" -t $f $p $m 2>>$DEBUG || 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
if swapon "$SWAPFILE" 2>>$DEBUG ; then
# we probably need some time until stateless autoconfiguration has happened
sleep 2
NETDEVICES="$(awk -F: '/eth.:|tr.:|wlan.:/{print $1}' /proc/net/dev 2>>$DEBUG)"
- for DEVICE in `echo "$NETDEVICES"`
- do
- eindent
- einfo "$DEVICE:"
- ADDRESSES="$(ifconfig $DEVICE | awk '/.*inet6 addr:.*/{print $3}')"
- COUNT="$(ifconfig $DEVICE | awk '/.*inet6 addr:.*/{ sum += 1};END {print sum }')"
+ for DEVICE in `echo "$NETDEVICES"`; do
eindent
- for ADDR in `echo "$ADDRESSES"`
- do
- einfo "$ADDR"
- done
- if [ "$COUNT" -eq "0" ]
- then
- einfo "(none)" ; eend 1
- fi
- eoutdent
+ einfo "$DEVICE:"
+ ADDRESSES="$(ifconfig $DEVICE | awk '/.*inet6 addr:.*/{print $3}')"
+ COUNT="$(ifconfig $DEVICE | awk '/.*inet6 addr:.*/{ sum += 1};END {print sum }')"
+ eindent
+ for ADDR in `echo "$ADDRESSES"` ; do
+ einfo "$ADDR"
+ done
+ if [ "$COUNT" -eq "0" ] ; then
+ einfo "(none)" ; eend 1
+ fi
+ eoutdent
eoutdent
done
eend 0
# {{{ Check for persistent homedir option and eventually mount /home from there, or use a loopback file.
config_homedir(){
+if checkbootparam home ; then
HOMEDIR="$(getbootparam home)"
MYHOMEDEVICE=""
MYHOMEMOUNTPOINT=""
EOT
fi
fi
+fi # checkbootparam home
}
# }}}
EOF
chmod 755 /etc/init.d/xstartup
- if grep -q xstartup /etc/inittab ; then
- sed -i 's#^6.*#6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"#' /etc/inittab
- else
- echo '6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"' >> /etc/inittab
- fi
+ sed -i 's#^6:.*#6:2345:respawn:/bin/zsh --login -c "/etc/init.d/xstartup ; /bin/zsh"#' /etc/inittab
+
/sbin/telinit q ; eend $?
if grep -q '^allowed_users=' /etc/X11/Xwrapper.config ; then