livecd: linuxrc - remove -n from umount, some busyboxes tend to fa...
havner
havner at pld-linux.org
Wed Jul 12 10:20:53 CEST 2006
Author: havner Date: Wed Jul 12 08:20:53 2006 GMT
Module: livecd Tag: HEAD
---- Log message:
- remove -n from umount, some busyboxes tend to fail with it
---- Files affected:
livecd:
linuxrc (1.24 -> 1.25)
---- Diffs:
================================================================
Index: livecd/linuxrc
diff -u livecd/linuxrc:1.24 livecd/linuxrc:1.25
--- livecd/linuxrc:1.24 Wed Jul 12 09:37:12 2006
+++ livecd/linuxrc Wed Jul 12 10:20:48 2006
@@ -159,7 +159,7 @@
PLDLIVECD="${I}"
break
fi
- umount -n /rootfs/media/LiveCD > $LOG 2>&1
+ umount /rootfs/media/LiveCD > $LOG 2>&1
fi
done
if [ "$PLDLIVECD" = "" ]; then
@@ -189,7 +189,7 @@
if getparam copycd > /dev/null; then
echo "${YELLOW}Copying iso to ram, please wait...${NORMAL}"
cp /rootfs/media/LiveCD/pldcd /rootfs
- umount -n /rootfs/media/LiveCD > $LOG 2>&1
+ umount /rootfs/media/LiveCD > $LOG 2>&1
rm -rf /rootfs/media/LiveCD
echo "${YELLOW}Done, you can now eject your cdrom${NORMAL}"
losetup /dev/loop7 /rootfs/pldcd
@@ -213,7 +213,7 @@
mount -o bind live/boot-bind boot > $LOG 2>&1
mount -o bind live/lib-bind lib > $LOG 2>&1
mount -o bind live/usr-bind usr > $LOG 2>&1
-umount -n /proc > $LOG 2>&1
+umount /proc > $LOG 2>&1
[ ! -d initrd ] && mkdir initrd
pivot_root . initrd
================================================================
---- CVS-web:
http://cvs.pld-linux.org/livecd/linuxrc?r1=1.24&r2=1.25&f=u
More information about the pld-cvs-commit
mailing list