summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-10 08:03:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-10 08:03:02 +0000
commit01583d526c8398b466bd66e331785768dccc5b60 (patch)
treecdfebedd2ecaed1be5f0fe47782371c8a8dd93c3
parentee1a64bdbd11691d9ab112557f61bd9de0e3f97a (diff)
downloaddrakx-01583d526c8398b466bd66e331785768dccc5b60.tar
drakx-01583d526c8398b466bd66e331785768dccc5b60.tar.gz
drakx-01583d526c8398b466bd66e331785768dccc5b60.tar.bz2
drakx-01583d526c8398b466bd66e331785768dccc5b60.tar.xz
drakx-01583d526c8398b466bd66e331785768dccc5b60.zip
umount mount point instead of umounting the loopback file
(works better when /etc/mtab is /proc/mounts)
-rwxr-xr-xrescue/make_rescue_img4
-rwxr-xr-xtools/make_mdkinst_stage22
2 files changed, 3 insertions, 3 deletions
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 9c7352338..076273f34 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -122,7 +122,7 @@ if (arch() =~ /ppc/) {
}
mkdir_p($mnt);
-__ "$sudo umount $rescue 2>/dev/null";
+__ "$sudo umount $mnt 2>/dev/null";
_ "dd if=/dev/zero of=$rescue bs=1k count=$size";
_ "$mke2fs $rescue";
@@ -133,7 +133,7 @@ _ "$sudo chown -R root.root $tmp";
_ "$sudo cp -a $tmp/* $mnt";
_ "$sudo rm -rf $tmp";
-_ "$sudo umount $rescue";
+_ "$sudo umount $mnt";
_ "rmdir $mnt";
_ "bzip2 -f -9 $rescue";
diff --git a/tools/make_mdkinst_stage2 b/tools/make_mdkinst_stage2
index babb3d567..be25bb089 100755
--- a/tools/make_mdkinst_stage2
+++ b/tools/make_mdkinst_stage2
@@ -77,7 +77,7 @@ $SUDO rm -rf $STAGE2TMP
df $MNTPOINT
df -i $MNTPOINT
-$SUDO umount $STAGE2
+$SUDO umount $MNTPOINT
rmdir $MNTPOINT
echo bzipping $STAGE2