}
# }}}
-# {{{ Check if we are running from the grml-CD or HD
+# {{{ Check if we are running in live mode or from HD
INSTALLED=""
[ -e /etc/grml_cd ] || INSTALLED="yes"
fi
else
- eerror "We are not running from CD - startx will not work, skipping it."
+ eerror "We are not running in live mode - startx will not work, skipping it."
eerror " -> Please use something like xdm, gdm or kdm for starting X on a harddisk system!" ; eend 1
fi
else
fi
fi
fi
+
if [ -n "$DCSDIR" ]; then
einfo "Debs, config, scripts will be read from $DCSDIR." ; eend 0
else
- einfo "Debs, config, scripts will be read from the CD image directly." ; eend 0
+ einfo "Debs, config, scripts will be read from the live image directly." ; eend 0
fi
}
fi
if grep -q $TARGET /proc/mounts ; then
- eerror "$TARGET already mounted, skipping execution of tohd therefore."
- eend 1
- return 1
+ eerror "$TARGET already mounted, skipping execution of tohd therefore."
+ eend 1
+ return 1
fi
local MOUNTDIR=$(mktemp -d)
if mount -o rw "$TARGET" "$MOUNTDIR" ; then
einfo "Copyring live system to $TARGET - this might take a while"
rsync -a --progress /live/image/live $MOUNTDIR
- sync
- umount "$MOUNTDIR"
+ sync
+ umount "$MOUNTDIR"
eend $?
- einfo "Booting with \"grml bootfrom=$TARGET\" should work now." ; eend 0
+ einfo "Booting with \"grml bootfrom=$TARGET\" should work now." ; eend 0
else
eerror "Error when trying to mount $TARGET, sorry."; eend 1
return 1
[Testing: issue715]
* Drop config_cdrom_scripts(): the bootoption "script" is triggered
by bootoption "scripts" and was never officially documented.
+ * Switch wording from 'CD' to 'live mode' where possible.
- -- Michael Prokop <mika@grml.org> Wed, 05 Aug 2009 15:30:25 +0200
+ -- Michael Prokop <mika@grml.org> Wed, 05 Aug 2009 15:36:21 +0200
grml-autoconfig (0.8.23) unstable; urgency=low