projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Würgaround for changed chpasswd options
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
46d2526
..
b11ee7c
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-675,6
+675,11
@@
stage() {
# create filesystem {{{
mkfs() {
# create filesystem {{{
mkfs() {
+ if grep -q $TARGET /proc/mounts ; then
+ eerror "$TARGET already mounted, exiting to avoid possible damage. (Manually unmount $TARGET)" ; eend 1
+ exit 1
+ fi
+
if [ -n "$MKFS" ] ; then
einfo "Running $MKFS on $TARGET"
$MKFS $TARGET
if [ -n "$MKFS" ] ; then
einfo "Running $MKFS on $TARGET"
$MKFS $TARGET
@@
-700,7
+705,7
@@
mount_target() {
einfo "Running grml-debootstrap on a directory, nothing to mount."
else
if grep -q $TARGET /proc/mounts ; then
einfo "Running grml-debootstrap on a directory, nothing to mount."
else
if grep -q $TARGET /proc/mounts ; then
- e
error "$TARGET already mounted, exiting."
+ e
warn "$TARGET already mounted, continuing anyway." ; eend 0
else
[ -d "$MNTPOINT" ] || mkdir -p "$MNTPOINT"
einfo "Mounting $TARGET to $MNTPOINT"
else
[ -d "$MNTPOINT" ] || mkdir -p "$MNTPOINT"
einfo "Mounting $TARGET to $MNTPOINT"