projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update changelog for release 3.0~b10-1+grml.1
[live-boot-grml.git]
/
scripts
/
boot
/
9990-main.sh
diff --git
a/scripts/boot/9990-main.sh
b/scripts/boot/9990-main.sh
index
ef41fb0
..
c696781
100755
(executable)
--- a/
scripts/boot/9990-main.sh
+++ b/
scripts/boot/9990-main.sh
@@
-32,6
+32,12
@@
Main ()
. /conf/param.conf
fi
. /conf/param.conf
fi
+ if [ -n "${FUSE_MOUNT}" ]
+ then
+ # fuse does not work with klibc mount
+ ln -f /bin/mount.util-linux /bin/mount
+ fi
+
# Needed here too because some things (*cough* udev *cough*)
# changes the timeout
# Needed here too because some things (*cough* udev *cough*)
# changes the timeout
@@
-146,8
+152,8
@@
Main ()
esac
# Move to the new root filesystem so that programs there can get at it.
esac
# Move to the new root filesystem so that programs there can get at it.
- mkdir -p /root/lib/live/
image
- mount --move /live/
image /root/lib/live/image
+ mkdir -p /root/lib/live/
mount/medium
+ mount --move /live/
medium /root/lib/live/mount/medium
# aufs2 in kernel versions around 2.6.33 has a regression:
# directories can't be accessed when read for the first the time,
# aufs2 in kernel versions around 2.6.33 has a regression:
# directories can't be accessed when read for the first the time,
@@
-158,8
+164,8
@@
Main ()
# Move findiso directory to the new root filesystem so that programs there can get at it.
if [ -d /live/findiso ]
then
# Move findiso directory to the new root filesystem so that programs there can get at it.
if [ -d /live/findiso ]
then
- mkdir -p /root/lib/live/findiso
- mount -n --move /live/findiso /root/lib/live/findiso
+ mkdir -p /root/lib/live/
mount/
findiso
+ mount -n --move /live/findiso /root/lib/live/
mount/
findiso
fi
# if we do not unmount the ISO we can't run "fsck /dev/ice" later on
fi
# if we do not unmount the ISO we can't run "fsck /dev/ice" later on
@@
-169,10
+175,10
@@
Main ()
then
losetup -d /dev/loop0
then
losetup -d /dev/loop0
- if is_mountpoint /root/lib/live/findiso
+ if is_mountpoint /root/lib/live/
mount/
findiso
then
then
- umount /root/lib/live/findiso
- rmdir --ignore-fail-on-non-empty /root/lib/live/findiso \
+ umount /root/lib/live/
mount/
findiso
+ rmdir --ignore-fail-on-non-empty /root/lib/live/
mount/
findiso \
>/dev/null 2>&1 || true
fi
fi
>/dev/null 2>&1 || true
fi
fi