summaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-06-05 19:29:17 +0000
committerOlivier Blin <oblin@mandriva.com>2008-06-05 19:29:17 +0000
commitdcbf8c1457b519c8af80a50c9538e4203958fc82 (patch)
tree46bcc2b242c6b25f821c09a2bb3125b9402062e8 /rescue
parent94cf7f68d2f74fdd20979cb75dd428cd9847193b (diff)
downloaddrakx-backup-do-not-use-dcbf8c1457b519c8af80a50c9538e4203958fc82.tar
drakx-backup-do-not-use-dcbf8c1457b519c8af80a50c9538e4203958fc82.tar.gz
drakx-backup-do-not-use-dcbf8c1457b519c8af80a50c9538e4203958fc82.tar.bz2
drakx-backup-do-not-use-dcbf8c1457b519c8af80a50c9538e4203958fc82.tar.xz
drakx-backup-do-not-use-dcbf8c1457b519c8af80a50c9538e4203958fc82.zip
use lumount when umounting loopbacks
Diffstat (limited to 'rescue')
-rwxr-xr-xrescue/Flash/scripts/reset_rootpass4
-rwxr-xr-xrescue/Flash/scripts/reset_userpass4
-rwxr-xr-xrescue/Flash/scripts/upgrade6
3 files changed, 7 insertions, 7 deletions
diff --git a/rescue/Flash/scripts/reset_rootpass b/rescue/Flash/scripts/reset_rootpass
index c0a505f21..63b4e8b3a 100755
--- a/rescue/Flash/scripts/reset_rootpass
+++ b/rescue/Flash/scripts/reset_rootpass
@@ -62,8 +62,8 @@ function cleanup() {
chroot $tmpdir/union /usr/bin/unicode_stop
umount $tmpdir/union > /dev/null 2>&1
- umount $tmpdir/user > /dev/null 2>&1
- umount $tmpdir/squash > /dev/null 2>&1
+ lumount $tmpdir/user > /dev/null 2>&1
+ lumount $tmpdir/squash > /dev/null 2>&1
umount $rootdir > /dev/null 2>&1
rmdir $tmpdir/union $tmpdir/user $tmpdir/squash 2> /dev/null
diff --git a/rescue/Flash/scripts/reset_userpass b/rescue/Flash/scripts/reset_userpass
index d34b629bf..320457cdc 100755
--- a/rescue/Flash/scripts/reset_userpass
+++ b/rescue/Flash/scripts/reset_userpass
@@ -73,8 +73,8 @@ function cleanup() {
chroot $tmpdir/union /usr/bin/unicode_stop
umount $tmpdir/union > /dev/null 2>&1
- umount $tmpdir/user > /dev/null 2>&1
- umount $tmpdir/squash > /dev/null 2>&1
+ lumount $tmpdir/user > /dev/null 2>&1
+ lumount $tmpdir/squash > /dev/null 2>&1
umount $rootdir > /dev/null 2>&1
rmdir $tmpdir/union $tmpdir/user $tmpdir/squash 2> /dev/null
diff --git a/rescue/Flash/scripts/upgrade b/rescue/Flash/scripts/upgrade
index 21b69cf2f..9d5dba227 100755
--- a/rescue/Flash/scripts/upgrade
+++ b/rescue/Flash/scripts/upgrade
@@ -79,7 +79,7 @@ function get_existing_rpms() {
fi
umount $tmpdir/union > /dev/null 2>&1
- umount $tmpdir/squash > /dev/null 2>&1
+ lumount $tmpdir/squash > /dev/null 2>&1
mkdir -p $tmpdir/user/root
diff /tmp/previous_rpms.list /tmp/existing_rpms.list | sed -n 's/^> //p' > $tmpdir/user/root/new_existing_rpms.list
@@ -205,8 +205,8 @@ function cleanup() {
cd /
umount $tmpdir/union > /dev/null 2>&1
- umount $tmpdir/user > /dev/null 2>&1
- umount $tmpdir/squash > /dev/null 2>&1
+ lumount $tmpdir/user > /dev/null 2>&1
+ lumount $tmpdir/squash > /dev/null 2>&1
umount $rootdir > /dev/null 2>&1
rmdir $tmpdir/union $tmpdir/user $tmpdir/squash 2> /dev/null