diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-12 22:35:05 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-12 22:35:05 +0100 |
| commit | d10c38678434e2cebb3d112687ee1d167d4e53c3 (patch) | |
| tree | 2622ba460b0059c0e723e36239e8a577b99113bd /src | |
| parent | 5a48005e28b2cfb43013cfa3bddbc8a50e70e189 (diff) | |
big exitcode fix that broke manual mountpoints selection
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 169fb66..d6b8b03 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -222,9 +222,9 @@ _mkfs() { if [ "${_fstype}" = "swap" ]; then swapoff ${_device} >/dev/null 2>&1 if [ "${_domk}" = "yes" ]; then - mkswap ${_device} >$LOG 2>&1 || show_warning "Error creating swap: mkswap ${_device}" && return 1 + mkswap ${_device} >$LOG 2>&1 || ( show_warning "Error creating swap: mkswap ${_device}" ; return 1 ) fi - swapon ${_device} >$LOG 2>&1 || show_warning "Error activating swap: swapon ${_device}" && return 1 + swapon ${_device} >$LOG 2>&1 || ( show_warning "Error activating swap: swapon ${_device}" ; return 1 ) else # make sure the fstype is one we can handle local knownfs=0 @@ -232,7 +232,7 @@ _mkfs() { [ "${_fstype}" = "${fs}" ] && knownfs=1 && break done - [ $knownfs -eq 0 ] && show_warning "unknown fstype ${_fstype} for ${_device}" && return 1 + [ $knownfs -eq 0 ] && ( show_warning "unknown fstype ${_fstype} for ${_device}" ; return 1 ) # if we were tasked to create the filesystem, do so if [ "${_domk}" = "yes" ]; then local ret @@ -245,14 +245,14 @@ _mkfs() { vfat) mkfs.vfat ${_device} >$LOG 2>&1; ret=$? ;; # don't handle anything else here, we will error later esac - [ $ret != 0 ] && show_warning "Error creating filesystem ${_fstype} on ${_device}" && return 1 + [ $ret != 0 ] && ( show_warning "Error creating filesystem ${_fstype} on ${_device}" ; return 1 ) sleep 2 fi # create our mount directory mkdir -p ${_dest}${_mountpoint} # mount the bad boy mount -t ${_fstype} ${_device} ${_dest}${_mountpoint} >$LOG 2>&1 - [ $? != 0 ] && show_warning "Error mounting ${_dest}${_mountpoint}" && return 1 + [ $? != 0 ] && ( show_warning "Error mounting ${_dest}${_mountpoint}" ; return 1 ) fi # add to temp fstab |